Fix compiler warnings.

diff --git a/fips/cmac/fips_cmac_selftest.c b/fips/cmac/fips_cmac_selftest.c
index c8435263d271798a0082a3eede1f5e3c931ea29d..8534190ff5b2ec532a3c7257e16f7e9ae48546ba 100644 (file)
--- 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 5930b98484f38d8b4d992f6ff3cabe031a12c376..cc07265370b2b349f3f7efdfa77d60552e3293c0 100644 (file)
--- 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;