From 3cebf35b1b0780fc4a2c8574fc5576b60dfd9a94 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Fri, 6 Oct 2023 14:44:29 -0700
Subject: [PATCH] Cleanups for IDE/WIN10 user_settings.h to allow for FIPS
 140-2 3389 cert. Fixed compiler warning with possible use of uninitialized
 data.

---
 IDE/WIN10/user_settings.h | 12 ++++++++++++
 src/pk.c                  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h
index 32d747e3c..cc1c34ede 100644
--- a/IDE/WIN10/user_settings.h
+++ b/IDE/WIN10/user_settings.h
@@ -1,6 +1,16 @@
 #ifndef _WIN_USER_SETTINGS_H_
 #define _WIN_USER_SETTINGS_H_
 
+/* For FIPS 140-2 3389 build set to "#if 1" */
+#if 0
+#undef HAVE_FIPS
+#define HAVE_FIPS
+#undef HAVE_FIPS_VERSION
+#define HAVE_FIPS_VERSION 2
+#undef HAVE_FIPS_VERSION_MINOR
+#define HAVE_FIPS_VERSION_MINOR 0
+#endif
+
 /* Set the following to 1 for WCv5.0-RC12 build. */
 #if 0
 #undef HAVE_FIPS
@@ -67,8 +77,10 @@
         #define WOLFSSL_VALIDATE_FFC_IMPORT
         #define HAVE_FFDHE_Q
         #define HAVE_PUBLIC_FFDHE
+    #ifdef _WIN64
         #define WOLFSSL_AESNI
         #define HAVE_INTEL_RDSEED
+    #endif
         #define FORCE_FAILURE_RDSEED
     #endif /* FIPS v2 */
     #if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 5)
diff --git a/src/pk.c b/src/pk.c
index a09b7f33e..0a595b75e 100644
--- a/src/pk.c
+++ b/src/pk.c
@@ -2110,7 +2110,7 @@ int wolfSSL_PEM_write_RSAPrivateKey(XFILE fp, WOLFSSL_RSA *rsa,
 {
     int ret = 1;
     byte* pem = NULL;
-    int pLen;
+    int pLen = 0;
 
     (void)cb;
     (void)arg;