projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warnings.
[openssl.git]
/
fips
/
cmac
/
fips_cmactest.c
diff --git
a/fips/cmac/fips_cmactest.c
b/fips/cmac/fips_cmactest.c
index 63349c19ad91298ed1cbc137fa77a435b1ae77a3..cc07265370b2b349f3f7efdfa77d60552e3293c0 100644
(file)
--- a/
fips/cmac/fips_cmactest.c
+++ b/
fips/cmac/fips_cmactest.c
@@
-130,7
+130,7
@@
int main(int argc, char **argv)
cipher = EVP_aes_192_cbc();
else if (!strcmp(p, "aes256"))
cipher = EVP_aes_256_cbc();
cipher = EVP_aes_192_cbc();
else if (!strcmp(p, "aes256"))
cipher = EVP_aes_256_cbc();
- else if (!strcmp(p, "tdea3"))
+ else if (!strcmp(p, "tdea3")
|| !strcmp(p, "tdes3")
)
{
cipher = EVP_des_ede3_cbc();
Klen_counts_keys = 1;
{
cipher = EVP_des_ede3_cbc();
Klen_counts_keys = 1;
@@
-456,7
+456,7
@@
static int print_cmac_gen(const EVP_CIPHER *cipher, FILE *out,
fputs("Error calculating CMAC\n", stderr);
rc = 0;
}
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;
{
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;
}
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;
{
fputs("Parameter error, Tlen > CMAC length\n", stderr);
rc = 0;