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

FIPS Macro Fix

Browse Source 
In a couple places the label WOLFSSL_FIPS was getting checked. Changed
to the correct HAVE_FIPS instead.
This commit is contained in:
John Safranek
2019-07-16 16:22:36 -07:00
parent 9c245b7fc5
commit 3aad9a2673
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api.c
View File

@ -11341,7 +11341,7 @@ static int test_wc_RsaPublicKeyDecodeRaw (void)
/* In FIPS builds, wc_MakeRsaKey() will return an error if it cannot find /* In FIPS builds, wc_MakeRsaKey() will return an error if it cannot find
* a probable prime in 5*(modLen/2) attempts. In non-FIPS builds, it keeps * a probable prime in 5*(modLen/2) attempts. In non-FIPS builds, it keeps
* trying until it gets a probable prime. */ * trying until it gets a probable prime. */
#ifdef WOLFSSL_FIPS #ifdef HAVE_FIPS
static int MakeRsaKeyRetry(RsaKey* key, int size, long e, WC_RNG* rng) static int MakeRsaKeyRetry(RsaKey* key, int size, long e, WC_RNG* rng)
{ {
int ret; int ret;
@ -20664,7 +20664,7 @@ static void test_wolfSSL_PKCS8_Compat(void)
static void test_wolfSSL_PKCS8_d2i(void) static void test_wolfSSL_PKCS8_d2i(void)
{ {
#ifndef WOLFSSL_FIPS #ifndef HAVE_FIPS
/* This test ends up using HMAC as a part of PBKDF2, and HMAC /* This test ends up using HMAC as a part of PBKDF2, and HMAC
* requires a 12 byte password in FIPS mode. This test ends up * requires a 12 byte password in FIPS mode. This test ends up
* trying to use an 8 byte password. */ * trying to use an 8 byte password. */
@ -20821,7 +20821,7 @@ static void test_wolfSSL_PKCS8_d2i(void)
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif
#endif /* WOLFSSL_FIPS */ #endif /* HAVE_FIPS */
} }
static void test_wolfSSL_ERR_put_error(void) static void test_wolfSSL_ERR_put_error(void)

4
wolfcrypt/src/rsa.c
View File

@ -3654,7 +3654,7 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
if (err == MP_OKAY) if (err == MP_OKAY)
err = _CheckProbablePrime(&p, NULL, &tmp3, size, &isPrime, rng); err = _CheckProbablePrime(&p, NULL, &tmp3, size, &isPrime, rng);
#ifdef WOLFSSL_FIPS #ifdef HAVE_FIPS
i++; i++;
#else #else
/* Keep the old retry behavior in non-FIPS build. */ /* Keep the old retry behavior in non-FIPS build. */
@ -3689,7 +3689,7 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
if (err == MP_OKAY) if (err == MP_OKAY)
err = _CheckProbablePrime(&p, &q, &tmp3, size, &isPrime, rng); err = _CheckProbablePrime(&p, &q, &tmp3, size, &isPrime, rng);
#ifdef WOLFSSL_FIPS #ifdef HAVE_FIPS
i++; i++;
#else #else
/* Keep the old retry behavior in non-FIPS build. */ /* Keep the old retry behavior in non-FIPS build. */