Commit bd7e6bd4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix compiler warnings.

parent 97057a1a

fips/cmac/fips_cmac_selftest.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

fips/cmac/fips_cmactest.c

+2 −2
Original line number Diff line number Diff line
@@ -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;