Get FIPS tests running

wolfSSL · Sep 6, 2024 · fe9a462 · fe9a462
1 parent 7c08d65
commit fe9a462
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/scripts/test-sanity.sh b/scripts/test-sanity.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # This script provides simple sanity checks to make sure the provider is working
+# NOTE: Careful running this script, because it will remove folders automatically
 
 SET_PRE=$( set )
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
@@ -23,7 +24,9 @@ function doTestCmd() {
 
 function runSpotCheck() {
     SPOTCHECK_ARGS=$1
-    rm -rf ${WOLFSSL_INSTALL_DIR} ${WOLFPROV_INSTALL_DIR}
+    unset OPENSSL_MODULES
+    unset OPENSSL_CONF
+    rm -rf ${WOLFSSL_INSTALL_DIR} ${WOLFSSL_SOURCE_DIR} ${WOLFPROV_INSTALL_DIR}
     doTestCmd "$1 init_wolfprov"
 
     SET_POST=$( set )

diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh
@@ -84,6 +84,7 @@ install_wolfssl() {
             WOLFSSL_CONFIG_CFLAGS+=" -DWOLFSSL_LOGGINGENABLED_DEFAULT=1"
         fi
         if [ "$WOLFSSL_ISFIPS" = "1" ]; then
+            printf "with FIPS ... "
             CONF_ARGS+=" --enable-fips=ready"
             if [ ! -e "XXX-fips-test" ]; then
                 ./fips-check.sh keep nomakecheck fips-ready >>$LOG_FILE 2>&1