WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.

pull/4359/head
Daniel Pouzzner 2021-09-29 17:15:33 -05:00
parent 5ef97acbab
commit f9627e4b14
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -212,8 +212,10 @@ fi
# The FIPS options are: # The FIPS options are:
# v5-RC8 - FIPS 140-3 (wolfCrypt WCv5.0-RC8) # v5-RC8 - FIPS 140-3 (wolfCrypt WCv5.0-RC8)
# v5 - FIPS 140-3 (wolfCrypt v5.0.0) # v5 - alias for v5-RC8 (may change)
# v3 - FIPS Ready # 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 # ready - same as v3
# rand - wolfRand # rand - wolfRand
# v2 - FIPS 140-2 Cert 3389 # v2 - FIPS 140-2 Cert 3389
@ -250,19 +252,25 @@ AS_CASE([$ENABLED_FIPS],
HAVE_FIPS_VERSION=2 HAVE_FIPS_VERSION=2
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
], ],
[v5-RC8],[ [v5|v5-RC8],[
FIPS_VERSION="$ENABLED_FIPS" FIPS_VERSION="$ENABLED_FIPS"
HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION=5
ENABLED_FIPS="yes" 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" FIPS_VERSION="$ENABLED_FIPS"
HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION=5
HAVE_FIPS_VERSION_MINOR=1 HAVE_FIPS_VERSION_MINOR=1
ENABLED_FIPS="yes" 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" if test -z "$HAVE_FIPS_VERSION_MINOR"