-Wsign-compare nits. hshoexer@ ok.

5 files changed, 15 insertions, 13 deletions

diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c
index 0db300947ef..dd77098fc9b 100644
--- a/sbin/isakmpd/cert.c
+++ b/sbin/isakmpd/cert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cert.c,v 1.24 2003/06/03 14:28:16 ho Exp $	*/
+/*	$OpenBSD: cert.c,v 1.25 2004/03/31 10:54:46 ho Exp $	*/
 /*	$EOM: cert.c,v 1.18 2000/09/28 12:53:27 niklas Exp $	*/
 
 /*
@@ -78,7 +78,8 @@ struct cert_handler cert_handler[] = {
 int
 cert_init (void)
 {
-  int i, err = 1;
+  size_t i;
+  int err = 1;
 
   for (i = 0; i < sizeof cert_handler / sizeof cert_handler[0]; i++)
     if (cert_handler[i].cert_init && !(*cert_handler[i].cert_init) ())
@@ -90,7 +91,8 @@ cert_init (void)
 int
 crl_init (void)
 {
-  int i, err = 1;
+  size_t i;
+  int err = 1;
 
   for (i = 0; i < sizeof cert_handler / sizeof cert_handler[0]; i++)
     if (cert_handler[i].crl_init && !(*cert_handler[i].crl_init) ())
@@ -102,7 +104,7 @@ crl_init (void)
 struct cert_handler *
 cert_get (u_int16_t id)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < sizeof cert_handler / sizeof cert_handler[0]; i++)
     if (id == cert_handler[i].id)
diff --git a/sbin/isakmpd/crypto.c b/sbin/isakmpd/crypto.c
index 08cfe6f9d12..964cb4e5f55 100644
--- a/sbin/isakmpd/crypto.c
+++ b/sbin/isakmpd/crypto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.c,v 1.18 2003/09/24 11:12:31 markus Exp $	*/
+/*	$OpenBSD: crypto.c,v 1.19 2004/03/31 10:54:46 ho Exp $	*/
 /*	$EOM: crypto.c,v 1.32 2000/03/07 20:08:51 niklas Exp $	*/
 
 /*
@@ -291,7 +291,7 @@ aes_decrypt (struct keystate *ks, u_int8_t *data, u_int16_t len)
 struct crypto_xf *
 crypto_get (enum transform id)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < sizeof transforms / sizeof transforms[0]; i++)
     if (id == transforms[i].id)
diff --git a/sbin/isakmpd/exchange.c b/sbin/isakmpd/exchange.c
index aee914169ca..a68bb3fbd84 100644
--- a/sbin/isakmpd/exchange.c
+++ b/sbin/isakmpd/exchange.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exchange.c,v 1.91 2004/02/16 20:40:34 markus Exp $	*/
+/*	$OpenBSD: exchange.c,v 1.92 2004/03/31 10:54:46 ho Exp $	*/
 /*	$EOM: exchange.c,v 1.143 2000/12/04 00:02:25 angelos Exp $	*/
 
 /*
@@ -1194,7 +1194,7 @@ exchange_dump_real (char *header, struct exchange *exchange, int class,
 {
   char buf[LOG_SIZE];
   /* Don't risk overflowing the final log buffer.  */
-  int bufsize_max = LOG_SIZE - strlen (header) - 32;
+  size_t bufsize_max = LOG_SIZE - strlen (header) - 32;
   struct sa *sa;
 
   LOG_DBG ((class, level,
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c
index 4018d81245d..978857eaba9 100644
--- a/sbin/isakmpd/hash.c
+++ b/sbin/isakmpd/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.13 2003/06/03 14:28:16 ho Exp $	*/
+/*	$OpenBSD: hash.c,v 1.14 2004/03/31 10:54:46 ho Exp $	*/
 /*	$EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $	*/
 
 /*
@@ -77,7 +77,7 @@ static struct hash hashes[] = {
 struct hash *
 hash_get (enum hashes hashtype)
 {
-  int i;
+  size_t i;
 
   LOG_DBG ((LOG_CRYPTO, 60, "hash_get: requested algorithm %d", hashtype));
 
diff --git a/sbin/isakmpd/ike_auth.c b/sbin/isakmpd/ike_auth.c
index 05e0c2245c9..377e60d670e 100644
--- a/sbin/isakmpd/ike_auth.c
+++ b/sbin/isakmpd/ike_auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ike_auth.c,v 1.83 2004/03/19 14:04:43 hshoexer Exp $	*/
+/*	$OpenBSD: ike_auth.c,v 1.84 2004/03/31 10:54:46 ho Exp $	*/
 /*	$EOM: ike_auth.c,v 1.59 2000/11/21 00:21:31 angelos Exp $	*/
 
 /*
@@ -124,7 +124,7 @@ static struct ike_auth ike_auth[] = {
 struct ike_auth *
 ike_auth_get (u_int16_t id)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < sizeof ike_auth / sizeof ike_auth[0]; i++)
     if (id == ike_auth[i].id)
@@ -251,7 +251,7 @@ ike_auth_get_key (int type, char *id, char *local_id, size_t *keylen)
 	      return 0;
 	    }
 
-	  if (read (fd, buf, size) != size)
+	  if (read (fd, buf, size) != (ssize_t)size)
 	    {
 	      free (buf);
 	      log_print ("ike_auth_get_key: "