Merge pull request #7248 from lealem47/ARMASM_UnitTest

Fix unit test failure for FIPS 140-2 + WOLFSSL_ARMASM
This commit is contained in:
David Garske
2024-02-15 08:25:42 -08:00
committed by GitHub

View File

@ -18496,9 +18496,15 @@ static int test_wc_AesGcmEncryptDecrypt(void)
ExpectIntEQ(wc_AesGcmDecrypt(&aes, dec, enc, sizeof(enc)/sizeof(byte), iv, ExpectIntEQ(wc_AesGcmDecrypt(&aes, dec, enc, sizeof(enc)/sizeof(byte), iv,
sizeof(iv)/sizeof(byte), NULL, sizeof(resultT), a, sizeof(a)), sizeof(iv)/sizeof(byte), NULL, sizeof(resultT), a, sizeof(a)),
BAD_FUNC_ARG); BAD_FUNC_ARG);
#if (defined(HAVE_FIPS) && FIPS_VERSION_LE(2,0) && defined(WOLFSSL_ARMASM))
ExpectIntEQ(wc_AesGcmDecrypt(&aes, dec, enc, sizeof(enc)/sizeof(byte), iv,
sizeof(iv)/sizeof(byte), resultT, sizeof(resultT) + 1, a, sizeof(a)),
AES_GCM_AUTH_E);
#else
ExpectIntEQ(wc_AesGcmDecrypt(&aes, dec, enc, sizeof(enc)/sizeof(byte), iv, ExpectIntEQ(wc_AesGcmDecrypt(&aes, dec, enc, sizeof(enc)/sizeof(byte), iv,
sizeof(iv)/sizeof(byte), resultT, sizeof(resultT) + 1, a, sizeof(a)), sizeof(iv)/sizeof(byte), resultT, sizeof(resultT) + 1, a, sizeof(a)),
BAD_FUNC_ARG); BAD_FUNC_ARG);
#endif
#if ((defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \ #if ((defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION == 2)) || defined(HAVE_SELFTEST)) && \ (HAVE_FIPS_VERSION == 2)) || defined(HAVE_SELFTEST)) && \
!defined(WOLFSSL_AES_GCM_FIXED_IV_AAD) !defined(WOLFSSL_AES_GCM_FIXED_IV_AAD)