wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7561 from kaleb-himes/SRTP-KDF-MAINTENANCE

Browse Source 
Address periodic CAST failures observed in unit.test by pre-empting CASTs
This commit is contained in:
Sean Parkinson
2024-05-21 09:16:23 +10:00
committed by GitHub
parent 7d4e601902 a22956d881
commit 095906f37a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit.c
View File

@ -68,7 +68,6 @@ int unit_test(int argc, char** argv)
(void)argc; (void)argc;
(void)argv; (void)argv;
#ifdef WOLFSSL_FORCE_MALLOC_FAIL_TEST #ifdef WOLFSSL_FORCE_MALLOC_FAIL_TEST
if (argc > 1) { if (argc > 1) {
int memFailCount = atoi(argv[1]); int memFailCount = atoi(argv[1]);
@ -161,7 +160,7 @@ int unit_test(int argc, char** argv)
err_sys("KDF TLSv1.2 CAST failed"); err_sys("KDF TLSv1.2 CAST failed");
} }
#endif #endif
#if defined(WOLFSSL_HAVE_PRF) && defined(WOLFSSL_TLS13) #if defined(HAVE_HKDF) && !defined(NO_HMAC)
if (wc_RunCast_fips(FIPS_CAST_KDF_TLS13) != 0) { if (wc_RunCast_fips(FIPS_CAST_KDF_TLS13) != 0) {
err_sys("KDF TLSv1.3 CAST failed"); err_sys("KDF TLSv1.3 CAST failed");
} }
@ -172,6 +171,11 @@ int unit_test(int argc, char** argv)
} }
#endif #endif
#endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */ #endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */
#if FIPS_VERSION3_GT(5,2,0)
if (wc_RunAllCast_fips() != 0) {
err_sys("wc_RunAllCast_fips() failed\n");
}
#endif
while (argc > 1) { while (argc > 1) {
if (argv[1][0] != '-') { if (argv[1][0] != '-') {