Merge pull request #6872 from douzzer/20231016-sp-math-aes-eax-fips-fixes

20231016-sp-math-aes-eax-fips-fixes
This commit is contained in:
JacobBarthelmeh
2023-10-16 13:43:26 -06:00
committed by GitHub
2 changed files with 7 additions and 4 deletions

View File

@ -19556,7 +19556,8 @@ static int test_wc_AesCcmEncryptDecrypt(void)
} /* END test_wc_AesCcmEncryptDecrypt */ } /* END test_wc_AesCcmEncryptDecrypt */
#if defined(WOLFSSL_AES_EAX) #if defined(WOLFSSL_AES_EAX) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 3)) && !defined(HAVE_SELFTEST)
/* /*
* Testing test_wc_AesEaxVectors() * Testing test_wc_AesEaxVectors()
@ -21028,7 +21029,9 @@ static int test_wc_AesEaxDecryptAuth(void)
return EXPECT_RESULT(); return EXPECT_RESULT();
} /* END test_wc_AesEaxDecryptAuth() */ } /* END test_wc_AesEaxDecryptAuth() */
#endif /* defined(WOLFSSL_AES_EAX) */ #endif /* WOLFSSL_AES_EAX &&
* (!HAVE_FIPS || FIPS_VERSION_GE(5, 3)) && !HAVE_SELFTEST
*/
/* /*
* Testing wc_InitDsaKey() * Testing wc_InitDsaKey()
@ -67214,7 +67217,8 @@ TEST_CASE testCases[] = {
TEST_DECL(test_wc_GmacUpdate), TEST_DECL(test_wc_GmacUpdate),
TEST_DECL(test_wc_AesCcmSetKey), TEST_DECL(test_wc_AesCcmSetKey),
TEST_DECL(test_wc_AesCcmEncryptDecrypt), TEST_DECL(test_wc_AesCcmEncryptDecrypt),
#if defined(WOLFSSL_AES_EAX) #if defined(WOLFSSL_AES_EAX) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(5, 3)) && !defined(HAVE_SELFTEST)
TEST_DECL(test_wc_AesEaxVectors), TEST_DECL(test_wc_AesEaxVectors),
TEST_DECL(test_wc_AesEaxEncryptAuth), TEST_DECL(test_wc_AesEaxEncryptAuth),
TEST_DECL(test_wc_AesEaxDecryptAuth), TEST_DECL(test_wc_AesEaxDecryptAuth),

View File

@ -1376,7 +1376,6 @@ static int eccsi_mulmod_base_add(EccsiKey* key, const mp_int* n,
err = NOT_COMPILED_IN; err = NOT_COMPILED_IN;
} }
(void)key; (void)key;
(void)h;
(void)a; (void)a;
(void)res; (void)res;
(void)mp; (void)mp;