diff options
| -rw-r--r-- | sbin/isakmpd/hash.c | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/hash.h | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/prf.c | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/prf.h | 4 |
4 files changed, 12 insertions, 11 deletions
diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c index 862e2675a3b..24d672bfb20 100644 --- a/sbin/isakmpd/hash.c +++ b/sbin/isakmpd/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.10 2002/08/23 18:17:17 ho Exp $ */ +/* $OpenBSD: hash.c,v 1.11 2002/11/21 09:40:34 ho Exp $ */ /* $EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $ */ /* @@ -50,7 +50,7 @@ #include "hash.h" #include "log.h" -void hmac_init (struct hash *, unsigned char *, int); +void hmac_init (struct hash *, unsigned char *, unsigned int); void hmac_final (unsigned char *, struct hash *); /* Temporary hash contexts. */ @@ -100,9 +100,9 @@ hash_get (enum hashes hashtype) */ void -hmac_init (struct hash *hash, unsigned char *okey, int len) +hmac_init (struct hash *hash, unsigned char *okey, unsigned int len) { - int i, blocklen = HMAC_BLOCKLEN; + unsigned int i, blocklen = HMAC_BLOCKLEN; unsigned char key[HMAC_BLOCKLEN]; memset (key, 0, blocklen); diff --git a/sbin/isakmpd/hash.h b/sbin/isakmpd/hash.h index 9f1c9544220..dceb37edb39 100644 --- a/sbin/isakmpd/hash.h +++ b/sbin/isakmpd/hash.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.h,v 1.4 2002/09/11 09:50:43 ho Exp $ */ +/* $OpenBSD: hash.h,v 1.5 2002/11/21 09:40:34 ho Exp $ */ /* $EOM: hash.h,v 1.6 1998/07/25 22:04:36 niklas Exp $ */ /* @@ -59,7 +59,7 @@ struct hash { void (*Init) (void *); void (*Update) (void *, unsigned char *, unsigned int); void (*Final) (unsigned char *, void *); - void (*HMACInit) (struct hash *, unsigned char *, int); + void (*HMACInit) (struct hash *, unsigned char *, unsigned int); void (*HMACFinal) (unsigned char *, struct hash *); }; @@ -70,6 +70,6 @@ struct hash { #define HMAC_BLOCKLEN 64 extern struct hash *hash_get (enum hashes); -extern void hmac_init (struct hash *, unsigned char *, int); +extern void hmac_init (struct hash *, unsigned char *, unsigned int); #endif /* _HASH_H_ */ diff --git a/sbin/isakmpd/prf.c b/sbin/isakmpd/prf.c index a3d1b7e5a69..fb053937a1d 100644 --- a/sbin/isakmpd/prf.c +++ b/sbin/isakmpd/prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prf.c,v 1.10 2002/09/11 09:50:44 ho Exp $ */ +/* $OpenBSD: prf.c,v 1.11 2002/11/21 09:40:34 ho Exp $ */ /* $EOM: prf.c,v 1.7 1999/05/02 12:50:29 niklas Exp $ */ /* @@ -76,7 +76,8 @@ prf_hash_final (unsigned char *digest, struct prf_hash_ctx *ctx) * the HMAC version of a hash. See RFC-2104 for reference. */ struct prf * -prf_alloc (enum prfs type, int subtype, unsigned char *shared, int sharedsize) +prf_alloc (enum prfs type, int subtype, unsigned char *shared, + unsigned int sharedsize) { struct hash *hash; struct prf *prf; diff --git a/sbin/isakmpd/prf.h b/sbin/isakmpd/prf.h index b19c40b41e4..4b6b36372fd 100644 --- a/sbin/isakmpd/prf.h +++ b/sbin/isakmpd/prf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prf.h,v 1.7 2002/09/11 09:50:44 ho Exp $ */ +/* $OpenBSD: prf.h,v 1.8 2002/11/21 09:40:34 ho Exp $ */ /* $EOM: prf.h,v 1.1 1998/07/11 20:06:22 provos Exp $ */ /* @@ -57,7 +57,7 @@ struct prf_hash_ctx { void *ctx, *ctx2; /* Contexts we need for later */ }; -struct prf *prf_alloc (enum prfs, int, unsigned char *, int); +struct prf *prf_alloc (enum prfs, int, unsigned char *, unsigned int); void prf_free (struct prf *); #endif /* _PRF_H_ */ |