diff --git a/configure.ac b/configure.ac index f421a11e5..f0723d54e 100644 --- a/configure.ac +++ b/configure.ac @@ -216,8 +216,9 @@ AC_ARG_ENABLE([fips], # v5-RC8 - historical FIPS 140-3 (wolfCrypt WCv5.0-RC8) # v5-RC9 - historical FIPS 140-3 (wolfCrypt WCv5.0-RC9) # v5-RC10 - historical FIPS 140-3, wolfCrypt/fips WCv5.0-RC10 -# v5-RC11 - FIPS 140-3, wolfCrypt/fips WCv5.0-RC11 -# v5 - currently, alias for v5-RC11 +# v5-RC11 - historical FIPS 140-3, wolfCrypt/fips WCv5.0-RC11 +# v5-RC12 - FIPS 140-3, wolfCrypt/fips WCv5.0-RC12 +# v5 - currently, alias for v5-RC12 # v5-ready - FIPS 140-3 settings with in-tree wolfcrypt sources, feature locked # v5-dev - FIPS 140-3 settings with in-tree wolfcrypt sources, features freely adjustable # ready - currently, same as v5-ready @@ -264,12 +265,18 @@ AS_CASE([$ENABLED_FIPS], HAVE_FIPS_VERSION_MINOR=2 ENABLED_FIPS="yes" ], - [v5|v5-RC11],[ + [v5-RC11],[ FIPS_VERSION="v5-RC11" HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION_MINOR=2 ENABLED_FIPS="yes" ], + [v5|v5-RC12],[ + FIPS_VERSION="v5-RC12" + HAVE_FIPS_VERSION=5 + HAVE_FIPS_VERSION_MINOR=2 + ENABLED_FIPS="yes" + ], [ready|v5-ready],[ FIPS_VERSION="v5-ready" HAVE_FIPS_VERSION=5 diff --git a/fips-check.sh b/fips-check.sh index e31420e14..14ebc21e1 100755 --- a/fips-check.sh +++ b/fips-check.sh @@ -223,22 +223,22 @@ netos-7.6) linuxv5) FIPS_REPO="git@github.com:wolfSSL/fips.git" - FIPS_VERSION="WCv5.0-RC11" + FIPS_VERSION="WCv5.0-RC12" CRYPT_REPO="git@github.com:wolfSSL/wolfssl.git" - CRYPT_VERSION="WCv5.0-RC11" + CRYPT_VERSION="WCv5.0-RC12" CRYPT_INC_PATH="wolfssl/wolfcrypt" CRYPT_SRC_PATH="wolfcrypt/src" WC_MODS=( aes sha sha256 sha512 rsa hmac random cmac dh ecc sha3 kdf ) - RNG_VERSION="WCv5.0-RC11" + RNG_VERSION="WCv5.0-RC12" FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c ) FIPS_INCS=( fips.h ) - FIPS_OPTION="v5-RC11" + FIPS_OPTION="v5-RC12" COPY_DIRECT=( wolfcrypt/src/aes_asm.S wolfcrypt/src/aes_asm.asm wolfcrypt/src/sha256_asm.S wolfcrypt/src/sha512_asm.S ) ;; linuxv5-ready|fips-ready|fips-v5-ready) FIPS_REPO="git@github.com:wolfSSL/fips.git" - FIPS_VERSION="WCv5.0-RC11" + FIPS_VERSION="WCv5.0-RC12" CRYPT_INC_PATH=wolfssl/wolfcrypt CRYPT_SRC_PATH=wolfcrypt/src FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c )