From 6cf186696e9e3f0b639aceb1638a91259adff28b 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 | 13 ++-----------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6f8053638..a3f2dabe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7099,7 +7099,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 0c1ad4d25..b65316de5 100644
--- a/src/include.am
+++ b/src/include.am
@@ -250,7 +250,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
@@ -323,7 +323,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 a8ff5974b..b44a774c5 100644
--- a/wolfssl/wolfcrypt/include.am
+++ b/wolfssl/wolfcrypt/include.am
@@ -152,12 +152,10 @@ 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_QNXCAAM
@@ -170,11 +168,4 @@ endif
 
 if BUILD_IOTSAFE
 nobase_include_HEADERS+= wolfssl/wolfcrypt/port/iotsafe/iotsafe.h
-
-if BUILD_FIPS_V3
-nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
-endif
-
-if BUILD_FIPS_V4
-nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
 endif