feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4804 from douzzer/20220127-clang-tidy-fips_test_h

Browse Source 
clang-tidy hygiene for fips_test.h
This commit is contained in:
John Safranek
2022-01-28 09:00:03 -08:00
committed by GitHub
parent cd72b4652b 30b2073228
commit 46f25ea3e0
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/api.c
View File

@ -13772,9 +13772,18 @@ static int test_wc_Md5HmacSetKey (void)
for (itr = 0; itr < times; itr++) { for (itr = 0; itr < times; itr++) {
ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[itr], ret = wc_HmacSetKey(&hmac, WC_MD5, (byte*)keys[itr],
(word32)XSTRLEN(keys[itr])); (word32)XSTRLEN(keys[itr]));
#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5)
wc_HmacFree(&hmac);
if (ret == BAD_FUNC_ARG)
return 0;
else {
return WOLFSSL_FATAL_ERROR;
}
#else
if (ret != 0) { if (ret != 0) {
flag = ret; flag = ret;
} }
#endif
} }
/* Bad args. */ /* Bad args. */
@ -14166,7 +14175,7 @@ static int test_wc_Sha384HmacSetKey (void)
static int test_wc_Md5HmacUpdate (void) static int test_wc_Md5HmacUpdate (void)
{ {
int flag = 0; int flag = 0;
#if !defined(NO_HMAC) && !defined(NO_MD5) #if !defined(NO_HMAC) && !defined(NO_MD5) && !(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5))
Hmac hmac; Hmac hmac;
testVector a, b; testVector a, b;
int ret; int ret;
@ -14567,7 +14576,7 @@ static int test_wc_Sha384HmacUpdate (void)
static int test_wc_Md5HmacFinal (void) static int test_wc_Md5HmacFinal (void)
{ {
int flag = 0; int flag = 0;
#if !defined(NO_HMAC) && !defined(NO_MD5) #if !defined(NO_HMAC) && !defined(NO_MD5) && !(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5))
Hmac hmac; Hmac hmac;
byte hash[WC_MD5_DIGEST_SIZE]; byte hash[WC_MD5_DIGEST_SIZE];
testVector a; testVector a;

3
tests/hash.c
View File

@ -130,7 +130,8 @@ int HashTest(void)
#endif #endif
#ifndef NO_HMAC #ifndef NO_HMAC
#ifndef NO_MD5 #if !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) \
&& (HAVE_FIPS_VERSION >= 5))
if ( (ret = hmac_md5_test()) ) { if ( (ret = hmac_md5_test()) ) {
printf( " HMAC-MD5 test failed!\n"); printf( " HMAC-MD5 test failed!\n");
return ret; return ret;

5
wolfcrypt/test/test.c
View File

@ -24642,7 +24642,8 @@ WOLFSSL_TEST_SUBROUTINE int ecc_encrypt_test(void)
ret = -10412; goto done; ret = -10412; goto done;
} }
#ifdef HAVE_COMP_KEY #if defined(HAVE_COMP_KEY) && \
(! defined(HAVE_FIPS) || (defined(FIPS_VERSION_GE) && FIPS_VERSION_GE(5,3)))
/* Create new client and server contexts. */ /* Create new client and server contexts. */
wc_ecc_ctx_free(srvCtx); wc_ecc_ctx_free(srvCtx);
wc_ecc_ctx_free(cliCtx); wc_ecc_ctx_free(cliCtx);
@ -24700,7 +24701,7 @@ WOLFSSL_TEST_SUBROUTINE int ecc_encrypt_test(void)
if (XMEMCMP(plain, msg, sizeof(msg)) != 0) { if (XMEMCMP(plain, msg, sizeof(msg)) != 0) {
ret = -10419; goto done; ret = -10419; goto done;
} }
#endif /* HAVE_COMP_KEY */ #endif /* HAVE_COMP_KEY && (!FIPS || FIPS>=5.3) */
#if (!defined(NO_ECC256) || defined(HAVE_ALL_CURVES)) && ECC_MIN_KEY_SZ <= 256 #if (!defined(NO_ECC256) || defined(HAVE_ALL_CURVES)) && ECC_MIN_KEY_SZ <= 256
ret = ecc_encrypt_kat(&rng); ret = ecc_encrypt_kat(&rng);

13
wolfssl/wolfcrypt/fips_test.h
View File

@ -77,16 +77,15 @@ WOLFSSL_API const char* wolfCrypt_GetCoreHash_fips(void);
#ifdef HAVE_FORCE_FIPS_FAILURE #ifdef HAVE_FORCE_FIPS_FAILURE
/* Public function to force failure mode for operational testing */ /* Public function to force failure mode for operational testing */
WOLFSSL_API int wolfCrypt_SetStatus_fips(int); WOLFSSL_API int wolfCrypt_SetStatus_fips(int status);
#endif #endif
WOLFSSL_LOCAL int DoIntegrityTest(char*, int); WOLFSSL_LOCAL int DoPOST(char* base16_hash, int base16_hashSz);
WOLFSSL_LOCAL int DoPOST(char*, int); WOLFSSL_LOCAL int DoCAST(int type);
WOLFSSL_LOCAL int DoCAST(int); WOLFSSL_LOCAL int DoKnownAnswerTests(char* base16_hash, int base16_hashSz); /* FIPSv1 and FIPSv2 */
WOLFSSL_LOCAL int DoKnownAnswerTests(char*, int); /* FIPSv1 and FIPSv2 */
WOLFSSL_API int wc_RunCast_fips(int); WOLFSSL_API int wc_RunCast_fips(int type);
WOLFSSL_API int wc_GetCastStatus_fips(int); WOLFSSL_API int wc_GetCastStatus_fips(int type);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */