@@ -31,17 +31,19 @@ Usage() {
3131 cat << usageText
3232Usage: $0 [flavor] [keep] [nomakecheck] [nodoconfigure] [noautogen]
3333Flavor is one of:
34- linuxv2 (FIPSv2, use for Win10)
35- fipsv2-OE-ready (ready FIPSv2)
34+ linuxv2 (FIPSv2, use for Win10)
35+ fipsv2-OE-ready (ready FIPSv2)
3636 solaris
3737 netbsd-selftest
3838 marvell-linux-selftest
39- linuxv5 (current FIPS 140-3)
40- fips-ready (ready FIPS 140-3)
41- fips-dev (dev FIPS 140-3)
39+ linuxv5 (current FIPS 140-3 [v5.2.1])
40+ linuxv5-RC12 (current FIPS 140-3 [v5.2.0.1])
41+ fips-ready (ready FIPS 140-3)
42+ fips-dev (dev FIPS 140-3)
4243 wolfrand
4344 wolfentropy
44- v6.0.0
45+ v6.0.0 (pending FIPS 140-3 [v6.0.0])
46+
4547keep: (default off) retains the temp dir $TEST_DIR for inspection.
4648nomakecheck: (default off) don't run make check
4749nodoconfigure: (default off) don't run configure
@@ -669,13 +671,9 @@ if [ "$DOCONFIGURE" = "yes" ]; then
669671 exit 3
670672 fi
671673
672- if [ -s wolfcrypt/src/fips_test.c ]; then
673- NEWHASH=$( ./wolfcrypt/test/testwolfcrypt | sed -n ' s/hash = \(.*\)/\1/p' )
674- if [ -n " $NEWHASH " ]; then
675- cp wolfcrypt/src/fips_test.c wolfcrypt/src/fips_test.c.bak
676- sed " s/^\" .*\" ;/\" ${NEWHASH} \" ;/" wolfcrypt/src/fips_test.c.bak > wolfcrypt/src/fips_test.c
677- make clean
678- fi
674+ if [ -s fips-hash.sh ]; then
675+ ./fips-hash.sh
676+ make clean
679677 fi
680678
681679 if [ " $MAKECHECK " = " yes" ]; then
0 commit comments