add HAVE_SELFTEST protection

This commit is contained in:
Brett Nicholas
2025-09-29 11:50:58 -06:00
parent 7b67dbaa31
commit 5121847728

View File

@@ -27897,7 +27897,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
L = (int)sizeof(okm1);
#ifndef NO_SHA
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0))
ret = wc_HKDF_ex(WC_SHA, ikm1, (word32)sizeof(ikm1), NULL, 0, NULL, 0,
okm1, (word32)L, HEAP_HINT, devId);
#else
@@ -27913,7 +27913,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
#ifndef HAVE_FIPS
/* fips can't have key size under 14 bytes, salt is key too */
L = (int)sizeof(okm1);
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0))
ret = wc_HKDF_ex(WC_SHA, ikm1, 11, salt1, (word32)sizeof(salt1), info1,
(word32)sizeof(info1), okm1, (word32)L, HEAP_HINT, devId);
#else
@@ -27929,7 +27929,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
#endif /* !NO_SHA */
#ifndef NO_SHA256
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0))
ret = wc_HKDF_ex(WC_SHA256, ikm1, (word32)sizeof(ikm1), NULL, 0, NULL, 0,
okm1, (word32)L, HEAP_HINT, devId);
#else
@@ -27944,9 +27944,15 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t hkdf_test(void)
#ifndef HAVE_FIPS
/* fips can't have key size under 14 bytes, salt is key too */
#if !defined(HAVE_SELFTEST)
ret = wc_HKDF_ex(WC_SHA256, ikm1, (word32)sizeof(ikm1),
salt1, (word32)sizeof(salt1), info1, (word32)sizeof(info1), okm1,
(word32)L, HEAP_HINT, devId);
#else
ret = wc_HKDF(WC_SHA256, ikm1, (word32)sizeof(ikm1), salt1,
(word32)sizeof(salt1), info1, (word32)sizeof(info1), okm1,
(word32)L);
#endif
if (ret != 0)
return WC_TEST_RET_ENC_EC(ret);
@@ -60826,7 +60832,7 @@ static int myCryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
if (info->kdf.type == WC_KDF_TYPE_HKDF) {
/* Redirect to software implementation for testing */
#if !defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)
#if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0))
ret = wc_HKDF_ex(info->kdf.hkdf.hashType,
info->kdf.hkdf.inKey, info->kdf.hkdf.inKeySz,
info->kdf.hkdf.salt, info->kdf.hkdf.saltSz,