wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4898 from kaleb-himes/140-2-ready

Browse Source
This commit is contained in:
Hayden Roche
2022-03-03 14:43:02 -08:00
committed by GitHub
parent 2567cd5e5a 0e8066dda0
commit 9ec30f02a6
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fips-check.sh
View File

@ -11,7 +11,7 @@
# #
# $ ./fips-check [flavor] [keep] # $ ./fips-check [flavor] [keep]
# #
# - flavor: linux (default), ios, android, windows, freertos, linux-ecc, netbsd-selftest, linuxv2, fips-ready, stm32l4-v2, linuxv5, linuxv5-ready, linuxv5-dev # - flavor: linux (default), ios, android, windows, freertos, linux-ecc, netbsd-selftest, linuxv2, fipsv2-OE-ready, fips-ready, stm32l4-v2, linuxv5, linuxv5-ready, linuxv5-dev
# #
# - keep: (default off) XXX-fips-test temp dir around for inspection # - keep: (default off) XXX-fips-test temp dir around for inspection
# #
@ -173,7 +173,7 @@ linux-ecc)
CRYPT_VERSION=$LINUX_ECC_CRYPT_VERSION CRYPT_VERSION=$LINUX_ECC_CRYPT_VERSION
CRYPT_REPO=$LINUX_ECC_CRYPT_REPO CRYPT_REPO=$LINUX_ECC_CRYPT_REPO
;; ;;
linuxv2) linuxv2 | fipsv2-OE-ready)
FIPS_VERSION=WCv4-stable FIPS_VERSION=WCv4-stable
FIPS_REPO=git@github.com:wolfssl/fips.git FIPS_REPO=git@github.com:wolfssl/fips.git
CRYPT_VERSION=WCv4-stable CRYPT_VERSION=WCv4-stable
@ -397,6 +397,19 @@ do
cp "fips/$INC" "$CRYPT_INC_PATH" cp "fips/$INC" "$CRYPT_INC_PATH"
done done
# When checking out cert 3389 ready code, NIST will no longer perform
# new certifications on 140-2 modules. If we were to use the latest files from
# master that would require re-cert due to changes in the module boundary.
# Since OE additions can still be processed for cert3389 we will call 140-2
# ready "fipsv2-OE-ready" indicating it is ready to use for an OE addition but
# would not be good for a new certification effort with the latest files.
if [ "$FLAVOR" = "fipsv2-OE-ready" ]; then
OLD_VERSION=" return \"v4.0.0-alpha\";"
OE_READY_VERSION=" return \"fipsv2-OE-ready\";"
cp "${CRYPT_SRC_PATH}/fips.c" "${CRYPT_SRC_PATH}/fips.c.bak"
sed "s/^${OLD_VERSION}/${OE_READY_VERSION}/" "${CRYPT_SRC_PATH}/fips.c.bak" >"${CRYPT_SRC_PATH}/fips.c"
fi
# run the make test # run the make test
./autogen.sh ./autogen.sh
if [ "$CAVP_SELFTEST_ONLY" == "yes" ]; if [ "$CAVP_SELFTEST_ONLY" == "yes" ];