From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 25 Mar 2011 12:36:02 +0000 (+0000)
Subject: Fix compiler warnings.
X-Git-Tag: OpenSSL-fips-2_0-rc1~633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd7e6bd44b2ebaff45aea1368886d4e9573e949c;p=openssl

Fix compiler warnings.
---

diff --git a/fips/cmac/fips_cmac_selftest.c b/fips/cmac/fips_cmac_selftest.c
index c8435263d2..8534190ff5 100644
--- a/fips/cmac/fips_cmac_selftest.c
+++ b/fips/cmac/fips_cmac_selftest.c
@@ -57,9 +57,9 @@
 #ifdef OPENSSL_FIPS
 typedef struct {
 	const EVP_CIPHER *(*alg)(void);
-	const unsigned char key[EVP_MAX_KEY_LENGTH]; int keysize;
-	const unsigned char msg[64]; int msgsize;
-	const unsigned char mac[32]; int macsize;
+	const unsigned char key[EVP_MAX_KEY_LENGTH]; size_t keysize;
+	const unsigned char msg[64]; size_t msgsize;
+	const unsigned char mac[32]; size_t macsize;
 } CMAC_KAT;
 
 /* from http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf */
diff --git a/fips/cmac/fips_cmactest.c b/fips/cmac/fips_cmactest.c
index 5930b98484..cc07265370 100644
--- a/fips/cmac/fips_cmactest.c
+++ b/fips/cmac/fips_cmactest.c
@@ -456,7 +456,7 @@ static int print_cmac_gen(const EVP_CIPHER *cipher, FILE *out,
 		fputs("Error calculating CMAC\n", stderr);
 		rc = 0;
 		}
-	else if (Tlen > reslen)
+	else if (Tlen > (int)reslen)
 		{
 		fputs("Parameter error, Tlen > CMAC length\n", stderr);
 		rc = 0;
@@ -491,7 +491,7 @@ static int print_cmac_ver(const EVP_CIPHER *cipher, FILE *out,
 		fputs("Error calculating CMAC\n", stderr);
 		rc = 0;
 		}
-	else if (Tlen > reslen)
+	else if (Tlen > (int)reslen)
 		{
 		fputs("Parameter error, Tlen > CMAC length\n", stderr);
 		rc = 0;