addendum2 to build script updates

--make and --distmake now preventing further building

Author: sebastian-carpenter

scripts/build-wolfprovider.sh

@@ -8,7 +8,7 @@ show_help() {
   echo "Script Arguments:"
   echo "  --help, -help, -h          Display this help menu and exit"
   echo "  --clean                    Run make clean in OpenSSL, wolfSSL, and wolfProvider"
-  echo "  --distclean                Remove source directories of OpenSSL and wolfSSL. If using wolfProvider it must be disabled or cloning will fail"
+  echo "  --distclean                Remove source directories of OpenSSL and wolfSSL"
   echo "  --debug                    Builds OpenSSL, wolfSSL, and WolfProvider with debugging enabled. This is the same as setting WOLFPROV_DEBUG=1"
   echo "  --debug-asn-template       Enable debug information for asn within wolfSSL"
   echo "  --disable-err-trace        No debug trace messages from library errors in wolfSSL"

scripts/utils-openssl.sh

@@ -37,6 +37,22 @@ NUMCPU=${NUMCPU:-8}
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 USE_CUR_TAG=${USE_CUR_TAG:-0}
 
+clean_openssl() {
+    printf "\n"
+
+    if [ "$WOLFPROV_CLEAN" -eq "1" ]; then
+        printf "Cleaning OpenSSL ...\n"
+        if [ -f "${OPENSSL_SOURCE_DIR}/Makefile" ]; then
+            make -C "${OPENSSL_SOURCE_DIR}" clean >>$LOG_FILE 2>&1
+        fi
+        rm -rf "${OPENSSL_INSTALL_DIR}"
+    fi
+    if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
+        printf "Removing OpenSSL source ...\n"
+        rm -rf "${OPENSSL_SOURCE_DIR}"
+    fi
+}
+
 clone_openssl() {
     if [ -d ${OPENSSL_SOURCE_DIR} ] && [ "$USE_CUR_TAG" != "1" ]; then
         check_git_match "${OPENSSL_TAG}" "${OPENSSL_SOURCE_DIR}"
@@ -78,21 +94,7 @@ clone_openssl() {
 }
 
 install_openssl() {
-    printf "\n"
-
-    if [ "$WOLFPROV_CLEAN" -eq "1" ]; then
-        printf "Cleaning OpenSSL ...\n"
-        if [ -f "${OPENSSL_SOURCE_DIR}/Makefile" ]; then
-            make -C "${OPENSSL_SOURCE_DIR}" clean >>$LOG_FILE 2>&1
-        fi
-        rm -rf "${OPENSSL_INSTALL_DIR}"
-    fi
-    if [ -d "${OPENSSL_SOURCE_DIR}" ] && [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
-        printf "Removing OpenSSL source ...\n"
-        rm -rf "${OPENSSL_SOURCE_DIR}"
-    fi
-
-    printf "Installing OpenSSL ${OPENSSL_TAG} ...\n"
+    printf "\nInstalling OpenSSL ${OPENSSL_TAG} ...\n"
     clone_openssl
     cd ${OPENSSL_SOURCE_DIR}
 

scripts/utils-wolfprovider.sh

@@ -46,12 +46,7 @@ WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 WOLFPROV_CLEAN=${WOLFPROV_CLEAN:-0}
 WOLFPROV_DISTCLEAN=${WOLFPROV_DISTCLEAN:-0}
 
-install_wolfprov() {
-    cd ${WOLFPROV_SOURCE_DIR}
-
-    init_openssl
-    init_wolfssl
-
+clean_wolfprov() {
     printf "\n"
 
     if [ "$WOLFPROV_CLEAN" -eq "1" ]; then
@@ -61,8 +56,15 @@ install_wolfprov() {
         fi
         rm -rf ${WOLFPROV_INSTALL_DIR}
     fi
+}
+
+install_wolfprov() {
+    cd ${WOLFPROV_SOURCE_DIR}
+
+    init_openssl
+    init_wolfssl
 
-    printf "Consolidating wolfProvider ...\n"
+    printf "\nConsolidating wolfProvider ...\n"
     unset OPENSSL_MODULES
     unset OPENSSL_CONF
     printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
@@ -119,17 +121,23 @@ install_wolfprov() {
 }
 
 init_wolfprov() {
-    # Unset WPFF so we dont fail unit test when building
-    if [ "${WOLFPROV_FORCE_FAIL}" = "1" ]; then
-        unset WOLFPROV_FORCE_FAIL
-        install_wolfprov
-        export WOLFPROV_FORCE_FAIL=1
+    if [ "$WOLFPROV_CLEAN" -eq "1" ] || [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
+        clean_openssl
+        clean_wolfssl
+        clean_wolfprov
     else
-        install_wolfprov
-    fi
-    printf "\twolfProvider installed in: ${WOLFPROV_INSTALL_DIR}\n"
+        # Unset WPFF so we dont fail unit test when building
+        if [ "${WOLFPROV_FORCE_FAIL}" = "1" ]; then
+            unset WOLFPROV_FORCE_FAIL
+            install_wolfprov
+            export WOLFPROV_FORCE_FAIL=1
+        else
+            install_wolfprov
+        fi
+        printf "\twolfProvider installed in: ${WOLFPROV_INSTALL_DIR}\n"
 
-    export OPENSSL_MODULES=$WOLFPROV_PATH
-    export OPENSSL_CONF=${WOLFPROV_CONFIG}
+        export OPENSSL_MODULES=$WOLFPROV_PATH
+        export OPENSSL_CONF=${WOLFPROV_CONFIG}
+    fi
 }
 

scripts/utils-wolfssl.sh

@@ -36,6 +36,22 @@ WOLFPROV_DISABLE_ERR_TRACE=${WOLFPROV_DISABLE_ERR_TRACE:-0}
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 USE_CUR_TAG=${USE_CUR_TAG:-0}
 
+clean_wolfssl() {
+    printf "\n"
+
+    if [ "$WOLFPROV_CLEAN" -eq "1" ]; then
+        printf "Cleaning wolfSSL ...\n"
+        if [ -f "${WOLFSSL_SOURCE_DIR}/Makefile" ]; then
+            make -C "${WOLFSSL_SOURCE_DIR}" clean >>$LOG_FILE 2>&1
+        fi
+        rm -rf "${WOLFSSL_INSTALL_DIR}"
+    fi
+    if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
+        printf "Removing wolfSSL source ...\n"
+        rm -rf "${WOLFSSL_SOURCE_DIR}"
+    fi
+}
+
 # Depends on OPENSSL_INSTALL_DIR
 clone_wolfssl() {
     if [ -n "$WOLFSSL_FIPS_BUNDLE" ]; then
@@ -72,21 +88,7 @@ clone_wolfssl() {
 }
 
 install_wolfssl() {
-    printf "\n"
-
-    if [ "$WOLFPROV_CLEAN" -eq "1" ]; then
-        printf "Cleaning wolfSSL ...\n"
-        if [ -f "${WOLFSSL_SOURCE_DIR}/Makefile" ]; then
-            make -C "${WOLFSSL_SOURCE_DIR}" clean >>$LOG_FILE 2>&1
-        fi
-        rm -rf "${WOLFSSL_INSTALL_DIR}"
-    fi
-    if [ -d "${WOLFSSL_SOURCE_DIR}" ] && [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
-        printf "Removing wolfSSL source ...\n"
-        rm -rf "${WOLFSSL_SOURCE_DIR}"
-    fi
-
-    printf "Installing wolfSSL ${WOLFSSL_TAG} ...\n"
+    printf "\nInstalling wolfSSL ${WOLFSSL_TAG} ...\n"
     clone_wolfssl
     cd ${WOLFSSL_SOURCE_DIR}