From 4124640a8d63795cace45c3de093cc288486a009 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Fri, 26 Mar 2021 14:56:55 -0700
Subject: [PATCH] Update the BUILD_FIPS_V4 flag to V5. Consolidate the Makefile
 include for the flavors of FIPS.

---
 configure.ac                 |  2 +-
 src/include.am               |  4 ++--
 wolfssl/wolfcrypt/include.am | 14 ++------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 74680a0bb..555c6c1f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6329,7 +6329,7 @@ AM_CONDITIONAL([BUILD_FIPS_V1],[test "x$FIPS_VERSION" = "xv1"])
 AM_CONDITIONAL([BUILD_FIPS_V2],[test "x$FIPS_VERSION" = "xv2"])
 AM_CONDITIONAL([BUILD_FIPS_RAND],[test "x$FIPS_VERSION" = "xrand"])
 AM_CONDITIONAL([BUILD_FIPS_V3],[test "x$FIPS_VERSION" = "xv3"])
-AM_CONDITIONAL([BUILD_FIPS_V4],[test "x$FIPS_VERSION" = "xv5"])
+AM_CONDITIONAL([BUILD_FIPS_V5],[test "x$FIPS_VERSION" = "xv5"])
 AM_CONDITIONAL([BUILD_FIPS_CURRENT],[test "x$FIPS_VERSION" = "xv2" || test "x$FIPS_VERSION" = "xv3" || test "x$FIPS_VERSION" = "xv5"])
 AM_CONDITIONAL([BUILD_CMAC],[test "x$ENABLED_CMAC" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
 AM_CONDITIONAL([BUILD_SELFTEST],[test "x$ENABLED_SELFTEST" = "xyes"])
diff --git a/src/include.am b/src/include.am
index b3b65b982..052a5d122 100644
--- a/src/include.am
+++ b/src/include.am
@@ -208,7 +208,7 @@ src_libwolfssl_la_SOURCES += wolfcrypt/src/fips.c \
 src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
 endif BUILD_FIPS_V3
 
-if BUILD_FIPS_V4
+if BUILD_FIPS_V5
 # FIPS 140-3 first file
 src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/wolfcrypt_first.c
@@ -281,7 +281,7 @@ src_libwolfssl_la_SOURCES += wolfcrypt/src/fips.c \
 
 # fips last file
 src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
-endif BUILD_FIPS_V4
+endif BUILD_FIPS_V5
 
 endif BUILD_FIPS
 
diff --git a/wolfssl/wolfcrypt/include.am b/wolfssl/wolfcrypt/include.am
index 5ba612577..65f1baf42 100644
--- a/wolfssl/wolfcrypt/include.am
+++ b/wolfssl/wolfcrypt/include.am
@@ -147,18 +147,8 @@ if BUILD_SELFTEST
 nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h
 endif
 
-if BUILD_FIPS_V2
+if BUILD_FIPS
+if !BUILD_FIPS_V1
 nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
 endif
-
-if BUILD_FIPS_RAND
-nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
-endif
-
-if BUILD_FIPS_V3
-nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
-endif
-
-if BUILD_FIPS_V4
-nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
 endif