wolfcrypt/test/test.c: use HAVE_FIPS_VERSION, not FIPS_VERSION.

This commit is contained in:
Daniel Pouzzner
2021-08-26 13:21:14 -05:00
parent 4cf1826c8f
commit 2bf711341b

View File

@@ -921,7 +921,8 @@ initDefaultName();
#endif #endif
#ifndef NO_HMAC #ifndef NO_HMAC
#if !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(FIPS_VERSION) && (FIPS_VERSION >= 5)) #if !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) \
&& (HAVE_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
@@ -3856,7 +3857,9 @@ WOLFSSL_TEST_SUBROUTINE int hash_test(void)
} }
#endif /* !NO_HASH_WRAPPER */ #endif /* !NO_HASH_WRAPPER */
#if !defined(NO_HMAC) && !defined(NO_MD5) && !(defined(HAVE_FIPS) && defined(FIPS_VERSION) && (FIPS_VERSION >= 5)) #if !defined(NO_HMAC) && !defined(NO_MD5) && !(defined(HAVE_FIPS) && \
defined(HAVE_FIPS_VERSION) && \
(HAVE_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 +3939,7 @@ WOLFSSL_TEST_SUBROUTINE int hmac_md5_test(void)
return 0; return 0;
} }
#endif /* !NO_HMAC && !NO_MD5 && !HAVE_FIPS */ #endif /* !NO_HMAC && !NO_MD5 && (!HAVE_FIPS || (HAVE_FIPS_VERSION < 5)) */
#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)