wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfcrypt/test/test.c: disable hmac_md5_test() for FIPS 140-3, and rename hkdf_test to wc_hkdf_test to eliminate namespace collision.

Browse Source
This commit is contained in:
Daniel Pouzzner
2021-08-26 10:22:07 -05:00
parent 89797db946
commit 8de8af8b43
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/test/test.c
View File

@@ -406,7 +406,7 @@ WOLFSSL_TEST_SUBROUTINE int hmac_sha256_test(void);
WOLFSSL_TEST_SUBROUTINE int hmac_sha384_test(void); WOLFSSL_TEST_SUBROUTINE int hmac_sha384_test(void);
WOLFSSL_TEST_SUBROUTINE int hmac_sha512_test(void); WOLFSSL_TEST_SUBROUTINE int hmac_sha512_test(void);
WOLFSSL_TEST_SUBROUTINE int hmac_sha3_test(void); WOLFSSL_TEST_SUBROUTINE int hmac_sha3_test(void);
/* WOLFSSL_TEST_SUBROUTINE */ static int hkdf_test(void); WOLFSSL_TEST_SUBROUTINE int wc_hkdf_test(void);
WOLFSSL_TEST_SUBROUTINE int sshkdf_test(void); WOLFSSL_TEST_SUBROUTINE int sshkdf_test(void);
WOLFSSL_TEST_SUBROUTINE int x963kdf_test(void); WOLFSSL_TEST_SUBROUTINE int x963kdf_test(void);
WOLFSSL_TEST_SUBROUTINE int arc4_test(void); WOLFSSL_TEST_SUBROUTINE int arc4_test(void);
@@ -921,7 +921,7 @@ initDefaultName();
#endif #endif
#ifndef NO_HMAC #ifndef NO_HMAC
#ifndef NO_MD5 #if !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(FIPS_VERSION) && (FIPS_VERSION >= 5))
if ( (ret = hmac_md5_test()) != 0) if ( (ret = hmac_md5_test()) != 0)
return err_sys("HMAC-MD5 test failed!\n", ret); return err_sys("HMAC-MD5 test failed!\n", ret);
else else
@@ -973,7 +973,7 @@ initDefaultName();
#endif #endif
#ifdef HAVE_HKDF #ifdef HAVE_HKDF
if ( (ret = hkdf_test()) != 0) if ( (ret = wc_hkdf_test()) != 0)
return err_sys("HMAC-KDF test failed!\n", ret); return err_sys("HMAC-KDF test failed!\n", ret);
else else
test_pass("HMAC-KDF test passed!\n"); test_pass("HMAC-KDF test passed!\n");
@@ -3856,7 +3856,7 @@ WOLFSSL_TEST_SUBROUTINE int hash_test(void)
} }
#endif /* !NO_HASH_WRAPPER */ #endif /* !NO_HASH_WRAPPER */
#if !defined(NO_HMAC) && !defined(NO_MD5) #if !defined(NO_HMAC) && !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(FIPS_VERSION) && (FIPS_VERSION >= 5))
WOLFSSL_TEST_SUBROUTINE int hmac_md5_test(void) WOLFSSL_TEST_SUBROUTINE int hmac_md5_test(void)
{ {
Hmac hmac; Hmac hmac;
@@ -3936,7 +3936,7 @@ WOLFSSL_TEST_SUBROUTINE int hmac_md5_test(void)
return 0; return 0;
} }
#endif /* NO_HMAC && NO_MD5 */ #endif /* !NO_HMAC && !NO_MD5 && !HAVE_FIPS */
#if !defined(NO_HMAC) && !defined(NO_SHA) #if !defined(NO_HMAC) && !defined(NO_SHA)
WOLFSSL_TEST_SUBROUTINE int hmac_sha_test(void) WOLFSSL_TEST_SUBROUTINE int hmac_sha_test(void)
@@ -20308,7 +20308,7 @@ WOLFSSL_TEST_SUBROUTINE int pwdbased_test(void)
#if defined(HAVE_HKDF) && !defined(NO_HMAC) #if defined(HAVE_HKDF) && !defined(NO_HMAC)
/* WOLFSSL_TEST_SUBROUTINE */ static int hkdf_test(void) WOLFSSL_TEST_SUBROUTINE int wc_hkdf_test(void)
{ {
int ret = 0; int ret = 0;