From dc6ec2b8492bf78c737f7fd9273a0074bf79da19 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Wed, 17 Nov 2021 09:22:58 -0700
Subject: [PATCH 1/3] Turn on AES-OFB mode in windows for FIPS=v5

---
 IDE/WIN10/user_settings.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h
index 826aa511b..0d2c832ee 100644
--- a/IDE/WIN10/user_settings.h
+++ b/IDE/WIN10/user_settings.h
@@ -99,6 +99,7 @@
         #define HAVE_FFDHE_6144
         #define HAVE_FFDHE_8192
         #define FP_MAX_BITS 16384
+        #define WOLFSSL_AES_OFB
     #endif /* FIPS v5 */
 #else
     /* Enables blinding mode, to prevent timing attacks */

From c7c682ba2a71010c2fd01126dd27a7d69c366600 Mon Sep 17 00:00:00 2001
From: Kaleb Himes <kaleb@wolfssl.com>
Date: Wed, 17 Nov 2021 09:37:26 -0700
Subject: [PATCH 2/3] Move up to avoid breaking the patch applied for windows

---
 IDE/WIN10/user_settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h
index 0d2c832ee..e434b91b9 100644
--- a/IDE/WIN10/user_settings.h
+++ b/IDE/WIN10/user_settings.h
@@ -98,8 +98,8 @@
         #define HAVE_FFDHE_4096
         #define HAVE_FFDHE_6144
         #define HAVE_FFDHE_8192
-        #define FP_MAX_BITS 16384
         #define WOLFSSL_AES_OFB
+        #define FP_MAX_BITS 16384
     #endif /* FIPS v5 */
 #else
     /* Enables blinding mode, to prevent timing attacks */

From ef62fab4eaac55eda203f20ecd7b1a1bca11ce76 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Wed, 17 Nov 2021 09:19:34 -0800
Subject: [PATCH 3/3] Update 1. WIN10 FIPS build should use version 5,2 now. 2.
 Update the v5-ready build ot use version 5,2. 3. Remove eol-whitespace from
 the benchmark source.

---
 IDE/WIN10/user_settings.h       | 2 +-
 configure.ac                    | 2 +-
 wolfcrypt/benchmark/benchmark.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IDE/WIN10/user_settings.h b/IDE/WIN10/user_settings.h
index e434b91b9..b5513e5bf 100644
--- a/IDE/WIN10/user_settings.h
+++ b/IDE/WIN10/user_settings.h
@@ -15,7 +15,7 @@
     #undef HAVE_FIPS_VERSION
     #define HAVE_FIPS_VERSION 5
     #undef HAVE_FIPS_VERSION_MINOR
-    #define HAVE_FIPS_VERSION_MINOR 1
+    #define HAVE_FIPS_VERSION_MINOR 2
 #endif
 
 
diff --git a/configure.ac b/configure.ac
index df0594bee..a66067f23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,7 +269,7 @@ AS_CASE([$ENABLED_FIPS],
     [ready|v5-ready],[
         FIPS_VERSION="v5-ready"
         HAVE_FIPS_VERSION=5
-        HAVE_FIPS_VERSION_MINOR=1
+        HAVE_FIPS_VERSION_MINOR=2
         ENABLED_FIPS="yes"
     ],
     [
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index 62dd2b5bc..8a5d02e4d 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -1825,7 +1825,7 @@ static void* benchmarks_do(void* args)
     #ifdef WOLFSSL_KEY_GEN
         if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) {
         #ifndef NO_SW_BENCH
-            if (((word32)bench_asym_algs == 0xFFFFFFFFU) || 
+            if (((word32)bench_asym_algs == 0xFFFFFFFFU) ||
                         (bench_asym_algs & BENCH_RSA_SZ) == 0) {
                 bench_rsaKeyGen(0);
             }