From db7f08e12f68c1e00bad3088f02ea8ebee8db89e Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 12 Dec 2023 15:14:51 -0700 Subject: [PATCH 1/2] Address fips 140-3 failures with wolfEngine support enabled --- wolfssl/wolfcrypt/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 5a01fe1e2..3c293421a 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -297,7 +297,7 @@ #if FIPS_VERSION_LT(2,0) #define WC_RNG RNG #else - #ifndef NO_OLD_RNGNAME + #ifndef RNG #define RNG WC_RNG #endif #endif From ca5adfaecbe6e38749213f7f2a60bebeb5328d20 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 12 Dec 2023 15:21:28 -0700 Subject: [PATCH 2/2] Add comments per peer review --- wolfssl/wolfcrypt/settings.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 3c293421a..779730155 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -297,6 +297,10 @@ #if FIPS_VERSION_LT(2,0) #define WC_RNG RNG #else + /* RNG needs to be defined to WC_RNG anytime another library on the + * system or other set of headers included by wolfSSL already defines + * RNG. Examples are: + * wolfEngine, wolfProvider and potentially other use-cases */ #ifndef RNG #define RNG WC_RNG #endif