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

wolfcrypt/test/test.c: in aes_xts_128_test(), gate in-place test on !HAVE_FIPS || FIPS_VERSION_GE(5,3); in hpke_test(), gate tests on availability of relevant ECC curve, not just on relevant digest.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-01-27 16:49:46 -06:00
parent 687bbeb712
commit d077c39f42
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/test/test.c
View File

@ -8497,6 +8497,8 @@ static int aes_xts_128_test(void)
0xff, 0x8d, 0xbc, 0x1d, 0x9f, 0x7f, 0xc8, 0x22 0xff, 0x8d, 0xbc, 0x1d, 0x9f, 0x7f, 0xc8, 0x22
}; };
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(5,3)
WOLFSSL_SMALL_STACK_STATIC unsigned char k3[] = { WOLFSSL_SMALL_STACK_STATIC unsigned char k3[] = {
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
@ -8522,6 +8524,8 @@ static int aes_xts_128_test(void)
0xB5, 0x5A, 0xDD, 0xCB, 0x80, 0xE0, 0xFC, 0xCD 0xB5, 0x5A, 0xDD, 0xCB, 0x80, 0xE0, 0xFC, 0xCD
}; };
#endif /* !HAVE_FIPS || FIPS_VERSION_GE(5,3) */
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
if ((aes = (XtsAes *)XMALLOC(sizeof *aes, HEAP_HINT, DYNAMIC_TYPE_AES)) == NULL) if ((aes = (XtsAes *)XMALLOC(sizeof *aes, HEAP_HINT, DYNAMIC_TYPE_AES)) == NULL)
ERROR_OUT(-5417, out); ERROR_OUT(-5417, out);
@ -8631,6 +8635,8 @@ static int aes_xts_128_test(void)
wc_AesXtsFree(aes); wc_AesXtsFree(aes);
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(5,3)
/* Test ciphertext stealing in-place. */ /* Test ciphertext stealing in-place. */
XMEMCPY(buf, p3, sizeof(p3)); XMEMCPY(buf, p3, sizeof(p3));
if (wc_AesXtsSetKey(aes, k3, sizeof(k3), AES_ENCRYPTION, if (wc_AesXtsSetKey(aes, k3, sizeof(k3), AES_ENCRYPTION,
@ -8662,6 +8668,8 @@ static int aes_xts_128_test(void)
if (XMEMCMP(p3, buf, sizeof(p3))) if (XMEMCMP(p3, buf, sizeof(p3)))
ERROR_OUT(-5422, out); ERROR_OUT(-5422, out);
#endif /* !HAVE_FIPS || FIPS_VERSION_GE(5,3) */
out: out:
if (aes_inited) if (aes_inited)
@ -22673,7 +22681,8 @@ WOLFSSL_TEST_SUBROUTINE int hpke_test(void)
return ret; return ret;
#endif #endif
#ifdef WOLFSSL_SHA384 #if defined(WOLFSSL_SHA384) && \
(defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES))
/* p384 */ /* p384 */
ret = wc_HpkeInit(hpke, DHKEM_P384_HKDF_SHA384, HKDF_SHA384, ret = wc_HpkeInit(hpke, DHKEM_P384_HKDF_SHA384, HKDF_SHA384,
HPKE_AES_128_GCM, NULL); HPKE_AES_128_GCM, NULL);
@ -22687,7 +22696,8 @@ WOLFSSL_TEST_SUBROUTINE int hpke_test(void)
return ret; return ret;
#endif #endif
#if defined(WOLFSSL_SHA384) || defined(WOLFSSL_SHA512) #if (defined(WOLFSSL_SHA384) || defined(WOLFSSL_SHA512)) && \
(defined(HAVE_ECC521) || defined(HAVE_ALL_CURVES))
/* p521 */ /* p521 */
ret = wc_HpkeInit(hpke, DHKEM_P521_HKDF_SHA512, HKDF_SHA512, ret = wc_HpkeInit(hpke, DHKEM_P521_HKDF_SHA512, HKDF_SHA512,
HPKE_AES_128_GCM, NULL); HPKE_AES_128_GCM, NULL);