From 9fa838881c347a5fe52f6cc02c2e4627e276289f Mon Sep 17 00:00:00 2001
From: Brett Nicholas <brett.r.nicholas.15@dartmouth.edu>
Date: Fri, 14 Jul 2023 10:54:47 -0600
Subject: [PATCH 1/3] fixed bug where tls_bench failed KATs for FIPS builds in
 a multithreaded environment

---
 examples/benchmark/tls_bench.c | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/examples/benchmark/tls_bench.c b/examples/benchmark/tls_bench.c
index cd672911f..56fea7b7d 100644
--- a/examples/benchmark/tls_bench.c
+++ b/examples/benchmark/tls_bench.c
@@ -383,6 +383,31 @@ char* myoptarg = NULL;
 int DoneHandShake = 0;
 #endif
 
+
+#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION == 5)
+static int run_all_CAST(void)
+{
+    int ret = 0;
+
+    for (int i=0; i<FIPS_CAST_COUNT; i++) {
+        if ((ret = wc_RunCast_fips(i)) != 0) {
+#ifdef NO_ERROR_STRINGS
+            fprintf(stderr,
+                    "ERROR: FIPS CAST failed with return code: %d\n", ret);
+#else
+            fprintf(stderr,
+                    "ERROR: FIPS CAST failed for algorithm: %s\n",
+                    wc_GetErrorString(ret));
+#endif
+            return ret;
+        }
+    }
+
+    return ret;
+}
+#endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */
+
+
 static double gettime_secs(int reset)
 {
     struct timeval tv;
@@ -1863,6 +1888,23 @@ int bench_tls(void* args)
     /* Initialize wolfSSL */
     wolfSSL_Init();
 
+#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION == 5)
+    /*
+     * When running benchmarks on FIPS builds, we need to run ALL CASTs up
+     * front before spawning client/server threads, otherwise there is the
+     * possibility that both threads try to run a CAST at the same time during
+     * the handshake. In this scenario, the thread that doesn't win the race
+     * will not be able to run the CAST, since it returns "busy", which is treated
+     * as a failure. Running the CASTs up front is a simpler solution than
+     * implementing an additional layer of synchronization.
+     */
+    if ((ret = run_all_CAST()) != 0)
+    {
+        fprintf(stderr, "CAST failed. Exiting benchmark\n");
+        goto exit;
+    }
+#endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */
+
     /* Parse command line arguments */
     while ((ch = mygetopt(argc, argv, "?" "udeil:p:t:vT:sch:P:mS:g")) != -1) {
         switch (ch) {

From e823da99aebe1aa7791d092d5fd2e32933456f96 Mon Sep 17 00:00:00 2001
From: Brett Nicholas <brett.r.nicholas.15@dartmouth.edu>
Date: Thu, 20 Jul 2023 16:22:48 -0600
Subject: [PATCH 2/3] declare loop variable at top of function body

---
 examples/benchmark/tls_bench.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/benchmark/tls_bench.c b/examples/benchmark/tls_bench.c
index 56fea7b7d..582aaadc9 100644
--- a/examples/benchmark/tls_bench.c
+++ b/examples/benchmark/tls_bench.c
@@ -388,9 +388,10 @@ int DoneHandShake = 0;
 static int run_all_CAST(void)
 {
     int ret = 0;
+    int cast_idx = 0;
 
-    for (int i=0; i<FIPS_CAST_COUNT; i++) {
-        if ((ret = wc_RunCast_fips(i)) != 0) {
+    for (cast_idx=0; cast_idx<FIPS_CAST_COUNT; cast_idx++) {
+        if ((ret = wc_RunCast_fips(cast_idx)) != 0) {
 #ifdef NO_ERROR_STRINGS
             fprintf(stderr,
                     "ERROR: FIPS CAST failed with return code: %d\n", ret);

From c6db51b8a0db29878edd8fa56ec7f68bb2ea2489 Mon Sep 17 00:00:00 2001
From: Brett Nicholas <7547222+bigbrett@users.noreply.github.com>
Date: Mon, 20 May 2024 12:47:30 -0600
Subject: [PATCH 3/3] fixed formatting

---
 examples/benchmark/tls_bench.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/benchmark/tls_bench.c b/examples/benchmark/tls_bench.c
index 582aaadc9..bf1d6fdf8 100644
--- a/examples/benchmark/tls_bench.c
+++ b/examples/benchmark/tls_bench.c
@@ -390,7 +390,7 @@ static int run_all_CAST(void)
     int ret = 0;
     int cast_idx = 0;
 
-    for (cast_idx=0; cast_idx<FIPS_CAST_COUNT; cast_idx++) {
+    for (cast_idx = 0; cast_idx < FIPS_CAST_COUNT; cast_idx++) {
         if ((ret = wc_RunCast_fips(cast_idx)) != 0) {
 #ifdef NO_ERROR_STRINGS
             fprintf(stderr,