Fix compiler warnings.

This commit is contained in:
Dr. Stephen Henson 2011-03-25 12:36:02 +00:00
parent 97057a1a7d
commit bd7e6bd44b
2 changed files with 5 additions and 5 deletions

View File

@ -57,9 +57,9 @@
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS
typedef struct { typedef struct {
const EVP_CIPHER *(*alg)(void); const EVP_CIPHER *(*alg)(void);
const unsigned char key[EVP_MAX_KEY_LENGTH]; int keysize; const unsigned char key[EVP_MAX_KEY_LENGTH]; size_t keysize;
const unsigned char msg[64]; int msgsize; const unsigned char msg[64]; size_t msgsize;
const unsigned char mac[32]; int macsize; const unsigned char mac[32]; size_t macsize;
} CMAC_KAT; } CMAC_KAT;
/* from http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf */ /* from http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf */

View File

@ -456,7 +456,7 @@ static int print_cmac_gen(const EVP_CIPHER *cipher, FILE *out,
fputs("Error calculating CMAC\n", stderr); fputs("Error calculating CMAC\n", stderr);
rc = 0; rc = 0;
} }
else if (Tlen > reslen) else if (Tlen > (int)reslen)
{ {
fputs("Parameter error, Tlen > CMAC length\n", stderr); fputs("Parameter error, Tlen > CMAC length\n", stderr);
rc = 0; rc = 0;
@ -491,7 +491,7 @@ static int print_cmac_ver(const EVP_CIPHER *cipher, FILE *out,
fputs("Error calculating CMAC\n", stderr); fputs("Error calculating CMAC\n", stderr);
rc = 0; rc = 0;
} }
else if (Tlen > reslen) else if (Tlen > (int)reslen)
{ {
fputs("Parameter error, Tlen > CMAC length\n", stderr); fputs("Parameter error, Tlen > CMAC length\n", stderr);
rc = 0; rc = 0;