configure.ac: FIPS: remap "ready" to be ready flavor of 140-3 (i.e. v5-ready); add v3-ready for ready flavor of 140-2.

pull/4359/head
Daniel Pouzzner 2021-10-26 20:10:33 -05:00
parent 8ee49cd50c
commit d527b25034
1 changed files with 5 additions and 4 deletions

View File

@ -210,8 +210,9 @@ AC_ARG_ENABLE([fips],
# v5 - alias for v5-RC8 (may change) # v5 - alias for v5-RC8 (may change)
# v5-REL - FIPS 140-3, placeholder for upcoming wolfCrypt v5.0.0 # v5-REL - FIPS 140-3, placeholder for upcoming wolfCrypt v5.0.0
# v5-ready - FIPS ready, 140-3 settings # v5-ready - FIPS ready, 140-3 settings
# ready -- same as v5-ready
# v3 - FIPS Ready, 140-2 settings # v3 - FIPS Ready, 140-2 settings
# ready - same as v3 # v3-ready - same as v3
# rand - wolfRand # rand - wolfRand
# v2 - FIPS 140-2 Cert 3389 # v2 - FIPS 140-2 Cert 3389
# no - FIPS build disabled # no - FIPS build disabled
@ -226,7 +227,7 @@ AS_CASE([$ENABLED_FIPS],
FIPS_VERSION="disabled" FIPS_VERSION="disabled"
ENABLED_FIPS="no" ENABLED_FIPS="no"
], ],
[ready|v3],[ [v3-ready|v3],[
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
FIPS_VERSION="v3" FIPS_VERSION="v3"
HAVE_FIPS_VERSION=3 HAVE_FIPS_VERSION=3
@ -264,14 +265,14 @@ AS_CASE([$ENABLED_FIPS],
HAVE_FIPS_VERSION_MINOR=1 HAVE_FIPS_VERSION_MINOR=1
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
], ],
[v5-ready],[ [ready|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, v5-RC8, v5-ready, no, disabled)]) AC_MSG_ERROR([Invalid value for --enable-fips "$ENABLED_FIPS" (allowed: ready, v3-ready, v5-ready, rand, v1, v2, v5, no, disabled)])
]) ])
if test -z "$HAVE_FIPS_VERSION_MINOR" if test -z "$HAVE_FIPS_VERSION_MINOR"