From f9627e4b14d7b25627c56c62b831ecaee0d37e2d Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Wed, 29 Sep 2021 17:15:33 -0500
Subject: [PATCH] configure.ac: for --enable-fips, make v5 an alias for v5-RC8
 (alias to be updated after newer lab-approved snapshots are tagged), and add
 v5-ready and a placeholder v5-REL.

---
 configure.ac | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6e0726aab..ee9600c65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,8 +212,10 @@ fi
 
 # The FIPS options are:
 #   v5-RC8 - FIPS 140-3 (wolfCrypt WCv5.0-RC8)
-#   v5 - FIPS 140-3 (wolfCrypt v5.0.0)
-#   v3 - FIPS Ready
+#   v5 - alias for v5-RC8 (may change)
+#   v5-REL - FIPS 140-3, placeholder for upcoming wolfCrypt v5.0.0
+#   v5-ready - FIPS ready, 140-3 settings
+#   v3 - FIPS Ready, 140-2 settings
 #   ready - same as v3
 #   rand - wolfRand
 #   v2 - FIPS 140-2 Cert 3389
@@ -250,19 +252,25 @@ AS_CASE([$ENABLED_FIPS],
         HAVE_FIPS_VERSION=2
         ENABLED_FIPS="yes"
     ],
-    [v5-RC8],[
+    [v5|v5-RC8],[
         FIPS_VERSION="$ENABLED_FIPS"
         HAVE_FIPS_VERSION=5
         ENABLED_FIPS="yes"
     ],
-    [v5],[
+    [v5-REL],[
+        FIPS_VERSION="$ENABLED_FIPS"
+        HAVE_FIPS_VERSION=5
+        HAVE_FIPS_VERSION_MINOR=1
+        ENABLED_FIPS="yes"
+    ],
+    [v5-ready],[
         FIPS_VERSION="$ENABLED_FIPS"
         HAVE_FIPS_VERSION=5
         HAVE_FIPS_VERSION_MINOR=1
         ENABLED_FIPS="yes"
     ],
     [
-        AC_MSG_ERROR([Invalid value for --enable-fips "$ENABLED_FIPS" (allowed: ready, rand, v1, v2, v5-RC8, v5, no, disabled)])
+        AC_MSG_ERROR([Invalid value for --enable-fips "$ENABLED_FIPS" (allowed: ready, rand, v1, v2, v5, v5-RC8, v5-ready, no, disabled)])
     ])
 
 if test -z "$HAVE_FIPS_VERSION_MINOR"