From cd26444e0185e19bfbc7c2f0f058ac728889fd73 Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Thu, 18 Feb 2021 09:56:37 +0900 Subject: [PATCH] addressed jenkins failure part1 --- configure.ac | 2 +- src/ssl.c | 2 +- tests/api.c | 49 ++++++++++++++++++------------------ wolfssl/wolfcrypt/md5.h | 2 +- wolfssl/wolfcrypt/settings.h | 4 ++- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 507fe147d..08414bb7d 100644 --- a/configure.ac +++ b/configure.ac @@ -5625,7 +5625,7 @@ AC_ARG_ENABLE([oldnames], if test "x$ENABLED_OLDNAMES" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then AM_CFLAGS="$AM_CFLAGS -DNO_OLD_RNGNAME -DNO_OLD_WC_NAMES -DNO_OLD_SSL_NAMES" - AM_CFLAGS="$AM_CFLAGS -DNO_OLD_SHA_NAMES" + AM_CFLAGS="$AM_CFLAGS -DNO_OLD_SHA_NAMES -DNO_OLD_MD5_NAME" fi diff --git a/src/ssl.c b/src/ssl.c index d7b1592f4..e77ac2756 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -26415,7 +26415,7 @@ static int woflSSL_X509_VERIFY_PARAM_inherit(WOLFSSL_X509_VERIFY_PARAM *to, if (isOverWrite || (from->hostName[0] != 0 && (to->hostName[0] == 0 || isDefault))) { if (!(ret = wolfSSL_X509_VERIFY_PARAM_set1_host(to, from->hostName, - XSTRLEN(from->hostName)))) + (int)XSTRLEN(from->hostName)))) return ret; to->hostFlags = from->hostFlags; } diff --git a/tests/api.c b/tests/api.c index 402d026c8..8934a3ebf 100644 --- a/tests/api.c +++ b/tests/api.c @@ -28070,14 +28070,14 @@ static void test_wolfSSL_CTX_get0_set1_param(void) AssertNotNull(pvpm); wolfSSL_X509_VERIFY_PARAM_set1_host(pvpm, testhostName, - XSTRLEN(testhostName)); + (int)XSTRLEN(testhostName)); wolfSSL_X509_VERIFY_PARAM_set1_ip_asc(pvpm, testIPv4); wolfSSL_X509_VERIFY_PARAM_set_hostflags(pvpm, 0x01); ret = SSL_CTX_set1_param(ctx, pvpm); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(pParam->hostName, testhostName, - XSTRLEN(testhostName))); + (int)XSTRLEN(testhostName))); AssertIntEQ(0x01, pParam->hostFlags); AssertIntEQ(0, XSTRNCMP(pParam->ipasc, testIPv4, WOLFSSL_MAX_IPSTR)); @@ -29966,10 +29966,10 @@ static void test_wolfSSL_X509_VERIFY_PARAM(void) XMEMSET(paramFrom, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM )); ret = wolfSSL_X509_VERIFY_PARAM_set1_host(paramFrom, testhostName1, - XSTRLEN(testhostName1)); + (int)XSTRLEN(testhostName1)); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(paramFrom->hostName, testhostName1, - XSTRLEN(testhostName1))); + (int)XSTRLEN(testhostName1))); wolfSSL_X509_VERIFY_PARAM_set_hostflags(NULL, 0x00); @@ -30004,13 +30004,13 @@ static void test_wolfSSL_X509_VERIFY_PARAM(void) ret = wolfSSL_X509_VERIFY_PARAM_set1(paramTo, paramFrom); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(paramTo->hostName, testhostName1, - XSTRLEN(testhostName1))); + (int)XSTRLEN(testhostName1))); AssertIntEQ(0x01, paramTo->hostFlags); AssertIntEQ(0, XSTRNCMP(paramTo->ipasc, testIPv6, WOLFSSL_MAX_IPSTR)); /* inherit flags test : VPARAM OVERWRITE */ wolfSSL_X509_VERIFY_PARAM_set1_host(paramTo, testhostName2, - XSTRLEN(testhostName2)); + (int)XSTRLEN(testhostName2)); wolfSSL_X509_VERIFY_PARAM_set1_ip_asc(paramTo, testIPv4); wolfSSL_X509_VERIFY_PARAM_set_hostflags(paramTo, 0x00); @@ -30019,13 +30019,13 @@ static void test_wolfSSL_X509_VERIFY_PARAM(void) ret = wolfSSL_X509_VERIFY_PARAM_set1(paramTo, paramFrom); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(paramTo->hostName, testhostName1, - XSTRLEN(testhostName1))); + (int)XSTRLEN(testhostName1))); AssertIntEQ(0x01, paramTo->hostFlags); AssertIntEQ(0, XSTRNCMP(paramTo->ipasc, testIPv6, WOLFSSL_MAX_IPSTR)); /* inherit flags test : VPARAM_RESET_FLAGS */ wolfSSL_X509_VERIFY_PARAM_set1_host(paramTo, testhostName2, - XSTRLEN(testhostName2)); + (int)XSTRLEN(testhostName2)); wolfSSL_X509_VERIFY_PARAM_set1_ip_asc(paramTo, testIPv4); wolfSSL_X509_VERIFY_PARAM_set_hostflags(paramTo, 0x10); @@ -30034,13 +30034,13 @@ static void test_wolfSSL_X509_VERIFY_PARAM(void) ret = wolfSSL_X509_VERIFY_PARAM_set1(paramTo, paramFrom); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(paramTo->hostName, testhostName1, - XSTRLEN(testhostName1))); + (int)XSTRLEN(testhostName1))); AssertIntEQ(0x01, paramTo->hostFlags); AssertIntEQ(0, XSTRNCMP(paramTo->ipasc, testIPv6, WOLFSSL_MAX_IPSTR)); /* inherit flags test : VPARAM_LOCKED */ wolfSSL_X509_VERIFY_PARAM_set1_host(paramTo, testhostName2, - XSTRLEN(testhostName2)); + (int)XSTRLEN(testhostName2)); wolfSSL_X509_VERIFY_PARAM_set1_ip_asc(paramTo, testIPv4); wolfSSL_X509_VERIFY_PARAM_set_hostflags(paramTo, 0x00); @@ -30049,7 +30049,7 @@ static void test_wolfSSL_X509_VERIFY_PARAM(void) ret = wolfSSL_X509_VERIFY_PARAM_set1(paramTo, paramFrom); AssertIntEQ(1, ret); AssertIntEQ(0, XSTRNCMP(paramTo->hostName, testhostName2, - XSTRLEN(testhostName2))); + (int)XSTRLEN(testhostName2))); AssertIntEQ(0x00, paramTo->hostFlags); AssertIntEQ(0, XSTRNCMP(paramTo->ipasc, testIPv4, WOLFSSL_MAX_IPSTR)); @@ -33034,16 +33034,15 @@ static void test_wolfSSL_MD5(void) /* Init MD5 CTX */ AssertIntEQ(wolfSSL_MD5_Init(&md5), 1); AssertIntEQ(wolfSSL_MD5_Update(&md5, input2, - XSTRLEN((const char*)input2)), 1); + (int)XSTRLEN((const char*)input2)), 1); AssertIntEQ(wolfSSL_MD5_Final(hash, &md5), 1); AssertIntEQ(XMEMCMP(&hash, output2, WC_MD5_DIGEST_SIZE), 0); -#if defined(OPENSSL_EXTRA) && !defined(HAVE_SELFTEST) && \ - (!defined(HAVE_FIPS) || \ - (defined(HAVE_FIPS_VERSION) && HAVE_FIPS_VERSION > 2)) - AssertIntEQ(MD5(input1, XSTRLEN((const char*)&input1), (byte*)&hash), 0); +#if !defined(NO_OLD_NAMES) && \ + (!defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))) + AssertIntEQ(MD5(input1, (int)XSTRLEN((const char*)&input1), (byte*)&hash), 0); AssertIntEQ(XMEMCMP(&hash, output1, WC_MD5_DIGEST_SIZE), 0); - AssertIntEQ(MD5(input2, XSTRLEN((const char*)&input2), (byte*)&hash), 0); + AssertIntEQ(MD5(input2, (int)XSTRLEN((const char*)&input2), (byte*)&hash), 0); AssertIntEQ(XMEMCMP(&hash, output2, WC_MD5_DIGEST_SIZE), 0); #endif @@ -33073,7 +33072,7 @@ static void test_wolfSSL_MD5_Transform(void) /* Init MD5 CTX */ AssertIntEQ(wolfSSL_MD5_Init(&md5), 1); /* Do Transform*/ - sLen = XSTRLEN((char*)input1); + sLen = (word32)XSTRLEN((char*)input1); XMEMCPY(local, input1, sLen); AssertIntEQ(wolfSSL_MD5_Transform(&md5, (const byte*)&local[0]), 1); @@ -33082,7 +33081,7 @@ static void test_wolfSSL_MD5_Transform(void) /* Init MD5 CTX */ AssertIntEQ(wolfSSL_MD5_Init(&md5), 1); - sLen = XSTRLEN((char*)input2); + sLen = (word32)XSTRLEN((char*)input2); XMEMSET(local, 0, WC_MD5_BLOCK_SIZE); XMEMCPY(local, input2, sLen); AssertIntEQ(wolfSSL_MD5_Transform(&md5, (const byte*)&local[0]), 1); @@ -33140,7 +33139,7 @@ static void test_wolfSSL_SHA_Transform(void) /* Init SHA CTX */ AssertIntEQ(wolfSSL_SHA_Init(&sha), 1); /* Do Transform*/ - sLen = XSTRLEN((char*)input1); + sLen = (word32)XSTRLEN((char*)input1); XMEMCPY(local, input1, sLen); AssertIntEQ(wolfSSL_SHA_Transform(&sha, (const byte*)&local[0]), 1); AssertIntEQ(XMEMCMP(&((wc_Sha*)&sha)->digest[0], output1, @@ -33148,7 +33147,7 @@ static void test_wolfSSL_SHA_Transform(void) /* Init SHA256 CTX */ AssertIntEQ(wolfSSL_SHA_Init(&sha), 1); - sLen = XSTRLEN((char*)input2); + sLen = (word32)XSTRLEN((char*)input2); XMEMSET(local, 0, WC_SHA_BLOCK_SIZE); XMEMCPY(local, input2, sLen); AssertIntEQ(wolfSSL_SHA_Transform(&sha, (const byte*)&local[0]), 1); @@ -33183,7 +33182,7 @@ static void test_wolfSSL_SHA256_Transform(void) /* Init SHA256 CTX */ AssertIntEQ(wolfSSL_SHA256_Init(&sha256), 1); /* Do Transform*/ - sLen = XSTRLEN((char*)input1); + sLen = (word32)XSTRLEN((char*)input1); XMEMCPY(local, input1, sLen); AssertIntEQ(wolfSSL_SHA256_Transform(&sha256, (const byte*)&local[0]), 1); AssertIntEQ(XMEMCMP(&((wc_Sha256*)&sha256)->digest[0], output1, @@ -33191,7 +33190,7 @@ static void test_wolfSSL_SHA256_Transform(void) /* Init SHA256 CTX */ AssertIntEQ(wolfSSL_SHA256_Init(&sha256), 1); - sLen = XSTRLEN((char*)input2); + sLen = (word32)XSTRLEN((char*)input2); XMEMSET(local, 0, WC_SHA256_BLOCK_SIZE); XMEMCPY(local, input2, sLen); AssertIntEQ(wolfSSL_SHA256_Transform(&sha256, (const byte*)&local[0]), 1); @@ -33255,7 +33254,7 @@ static void test_wolfSSL_SHA512_Transform(void) AssertIntEQ(wolfSSL_SHA512_Init(&sha512), 1); /* Do Transform*/ - sLen = XSTRLEN((char*)input1); + sLen = (word32)XSTRLEN((char*)input1); XMEMCPY(local, input1, sLen); AssertIntEQ(wolfSSL_SHA512_Transform(&sha512, (const byte*)&local[0]), 1); AssertIntEQ(XMEMCMP(&((wc_Sha512*)&sha512)->digest[0], output1, @@ -33263,7 +33262,7 @@ static void test_wolfSSL_SHA512_Transform(void) /* Init SHA512 CTX */ AssertIntEQ(wolfSSL_SHA512_Init(&sha512), 1); - sLen = XSTRLEN((char*)input2); + sLen = (word32)XSTRLEN((char*)input2); XMEMSET(local, 0, WC_SHA512_BLOCK_SIZE); XMEMCPY(local, input2, sLen); AssertIntEQ(wolfSSL_SHA512_Transform(&sha512, (const byte*)&local[0]), 1); diff --git a/wolfssl/wolfcrypt/md5.h b/wolfssl/wolfcrypt/md5.h index 30f46078d..290c5ec91 100644 --- a/wolfssl/wolfcrypt/md5.h +++ b/wolfssl/wolfcrypt/md5.h @@ -42,7 +42,7 @@ extern "C" { #endif -#if !defined(NO_OLD_MD5_NAMES) +#if !defined(NO_OLD_MD5_NAME) #define MD5 WC_MD5 #endif diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 102665c57..f01fcdd56 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2275,7 +2275,9 @@ extern void uITRON4_free(void *p) ; /* added to have compatibility with SHA256() */ #if !defined(NO_OLD_SHA_NAMES) && !defined(HAVE_FIPS) #define NO_OLD_SHA_NAMES - #define NO_OLD_MD5_NAMES + #endif + #if !defined(NO_OLD_MD5_NAME) && !defined(HAVE_FIPS) + #define NO_OLD_MD5_NAME #endif #endif