From e9c31cd679486cb931c75520f28e79fcb2bc99d1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 31 Jan 2006 00:25:46 +0000 Subject: [PATCH] silence compiler warnings --- lib/isc/hmacsha.c | 32 ++++++++++++++++---------------- lib/isc/include/isc/md5.h | 4 ++-- lib/isc/include/isc/sha2.h | 10 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c index 2ff276a9db..0277d4f0b2 100644 --- a/lib/isc/hmacsha.c +++ b/lib/isc/hmacsha.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hmacsha.c,v 1.2.2.2 2006/01/27 23:57:45 marka Exp $ */ +/* $Id: hmacsha.c,v 1.2.2.3 2006/01/31 00:25:46 marka Exp $ */ /* * This code implements the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256, HMAC-SHA384 @@ -40,10 +40,10 @@ */ void isc_hmacsha1_init(isc_hmacsha1_t *ctx, const unsigned char *key, - unsigned int len) + unsigned int len) { unsigned char ipad[ISC_SHA1_DIGESTLENGTH]; - int i; + unsigned int i; memset(ctx->key, 0, sizeof(ctx->key)); if (len > sizeof(ctx->key)) { @@ -86,7 +86,7 @@ void isc_hmacsha1_sign(isc_hmacsha1_t *ctx, unsigned char *digest, size_t len) { unsigned char opad[ISC_SHA1_DIGESTLENGTH]; unsigned char newdigest[ISC_SHA1_DIGESTLENGTH]; - int i; + unsigned int i; REQUIRE(len <= ISC_SHA1_DIGESTLENGTH); isc_sha1_final(&ctx->sha1ctx, newdigest); @@ -122,10 +122,10 @@ isc_hmacsha1_verify(isc_hmacsha1_t *ctx, unsigned char *digest, size_t len) { */ void isc_hmacsha224_init(isc_hmacsha224_t *ctx, const unsigned char *key, - unsigned int len) + unsigned int len) { unsigned char ipad[ISC_SHA224_DIGESTLENGTH]; - int i; + unsigned int i; memset(ctx->key, 0, sizeof(ctx->key)); if (len > sizeof(ctx->key)) { @@ -167,7 +167,7 @@ void isc_hmacsha224_sign(isc_hmacsha224_t *ctx, unsigned char *digest, size_t len) { unsigned char opad[ISC_SHA224_DIGESTLENGTH]; unsigned char newdigest[ISC_SHA224_DIGESTLENGTH]; - int i; + unsigned int i; REQUIRE(len <= ISC_SHA224_DIGESTLENGTH); isc_sha224_final(newdigest, &ctx->sha224ctx); @@ -202,10 +202,10 @@ isc_hmacsha224_verify(isc_hmacsha224_t *ctx, unsigned char *digest, size_t len) */ void isc_hmacsha256_init(isc_hmacsha256_t *ctx, const unsigned char *key, - unsigned int len) + unsigned int len) { unsigned char ipad[ISC_SHA256_DIGESTLENGTH]; - int i; + unsigned int i; memset(ctx->key, 0, sizeof(ctx->key)); if (len > sizeof(ctx->key)) { @@ -247,7 +247,7 @@ void isc_hmacsha256_sign(isc_hmacsha256_t *ctx, unsigned char *digest, size_t len) { unsigned char opad[ISC_SHA256_DIGESTLENGTH]; unsigned char newdigest[ISC_SHA256_DIGESTLENGTH]; - int i; + unsigned int i; REQUIRE(len <= ISC_SHA256_DIGESTLENGTH); isc_sha256_final(newdigest, &ctx->sha256ctx); @@ -282,10 +282,10 @@ isc_hmacsha256_verify(isc_hmacsha256_t *ctx, unsigned char *digest, size_t len) */ void isc_hmacsha384_init(isc_hmacsha384_t *ctx, const unsigned char *key, - unsigned int len) + unsigned int len) { unsigned char ipad[ISC_SHA384_DIGESTLENGTH]; - int i; + unsigned int i; memset(ctx->key, 0, sizeof(ctx->key)); if (len > sizeof(ctx->key)) { @@ -327,7 +327,7 @@ void isc_hmacsha384_sign(isc_hmacsha384_t *ctx, unsigned char *digest, size_t len) { unsigned char opad[ISC_SHA384_DIGESTLENGTH]; unsigned char newdigest[ISC_SHA384_DIGESTLENGTH]; - int i; + unsigned int i; REQUIRE(len <= ISC_SHA384_DIGESTLENGTH); isc_sha384_final(newdigest, &ctx->sha384ctx); @@ -362,10 +362,10 @@ isc_hmacsha384_verify(isc_hmacsha384_t *ctx, unsigned char *digest, size_t len) */ void isc_hmacsha512_init(isc_hmacsha512_t *ctx, const unsigned char *key, - unsigned int len) + unsigned int len) { unsigned char ipad[ISC_SHA512_DIGESTLENGTH]; - int i; + unsigned int i; memset(ctx->key, 0, sizeof(ctx->key)); if (len > sizeof(ctx->key)) { @@ -407,7 +407,7 @@ void isc_hmacsha512_sign(isc_hmacsha512_t *ctx, unsigned char *digest, size_t len) { unsigned char opad[ISC_SHA512_DIGESTLENGTH]; unsigned char newdigest[ISC_SHA512_DIGESTLENGTH]; - int i; + unsigned int i; REQUIRE(len <= ISC_SHA512_DIGESTLENGTH); isc_sha512_final(newdigest, &ctx->sha512ctx); diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h index 5fe88acb40..a3d238d8a3 100644 --- a/lib/isc/include/isc/md5.h +++ b/lib/isc/include/isc/md5.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: md5.h,v 1.9.18.2 2005/04/29 00:16:59 marka Exp $ */ +/* $Id: md5.h,v 1.9.18.3 2006/01/31 00:25:46 marka Exp $ */ /*! \file * \brief This is the header file for the MD5 message-digest algorithm. @@ -46,7 +46,7 @@ #include #include -#define ISC_MD5_DIGESTLENGTH 16 +#define ISC_MD5_DIGESTLENGTH 16U typedef struct { isc_uint32_t buf[4]; diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h index b7c91e574f..6618c61b1b 100644 --- a/lib/isc/include/isc/sha2.h +++ b/lib/isc/include/isc/sha2.h @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sha2.h,v 1.2.2.2 2006/01/27 23:57:45 marka Exp $ */ +/* $Id: sha2.h,v 1.2.2.3 2006/01/31 00:25:46 marka Exp $ */ /* $FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $ */ /* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */ @@ -62,16 +62,16 @@ /*** SHA-224/256/384/512 Various Length Definitions ***********************/ -#define ISC_SHA224_DIGESTLENGTH 28 +#define ISC_SHA224_DIGESTLENGTH 28U #define ISC_SHA224_DIGESTSTRINGLENGTH (ISC_SHA224_DIGESTLENGTH * 2 + 1) #define ISC_SHA256_BLOCK_LENGTH 64 -#define ISC_SHA256_DIGESTLENGTH 32 +#define ISC_SHA256_DIGESTLENGTH 32U #define ISC_SHA256_DIGESTSTRINGLENGTH (ISC_SHA256_DIGESTLENGTH * 2 + 1) #define ISC_SHA384_BLOCK_LENGTH 128 -#define ISC_SHA384_DIGESTLENGTH 48 +#define ISC_SHA384_DIGESTLENGTH 48U #define ISC_SHA384_DIGESTSTRINGLENGTH (ISC_SHA384_DIGESTLENGTH * 2 + 1) #define ISC_SHA512_BLOCK_LENGTH 128 -#define ISC_SHA512_DIGESTLENGTH 64 +#define ISC_SHA512_DIGESTLENGTH 64U #define ISC_SHA512_DIGESTSTRINGLENGTH (ISC_SHA512_DIGESTLENGTH * 2 + 1)