Make use of the utils-* helpers in all test-* scripts

Author: Andras Fekete

scripts/test-openssl.sh

@@ -247,15 +247,15 @@ WOLFPROV_DIR=$PWD
 WOLFPROV_CONFIG=$WOLFPROV_DIR/provider.conf
 WOLFPROV_PATH=$WOLFPROV_DIR/.libs
 LOGDIR=$WOLFPROV_DIR/scripts/log
-LOGFILE=$LOGDIR/dependencies.log
+LOG_FILE=$LOGDIR/dependencies.log
 export OPENSSL_MODULES=$WOLFPROV_PATH
 
 if [ ! -d "$LOGDIR" ]; then
     mkdir $LOGDIR
 fi
 
 # Fresh start
-rm -f $LOGFILE
+rm -f $LOG_FILE
 
 if [ -z $NUMCPU ]; then
     if [[ "$OSTYPE" == "linux-gnu" ]]; then
@@ -280,12 +280,28 @@ printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 # Set up wolfProvider
 cd ${WOLFPROV_DIR}
 if [ ! -e "${WOLFPROV_DIR}/configure" ]; then
-    ./autogen.sh &>> $LOGFILE
-    ./configure --with-wolfssl=${WOLFSSL_INSTALL_DIR} &>> $LOGFILE
+    ./autogen.sh &>> $LOG_FILE
+    ./configure --with-wolfssl=${WOLFSSL_INSTALL_DIR} &>> $LOG_FILE
+fi
+make &>> $LOG_FILE
+if [ $? != 0 ]; then
+  tail -n 20 $LOG_FILE
+  do_cleanup
+  exit 1
+fi
+
+make test &>> $LOG_FILE
+if [ $? != 0 ]; then
+  tail -n 20 $LOG_FILE
+  do_cleanup
+  exit 1
+fi
+make install &>> $LOG_FILE
+if [ $? != 0 ]; then
+  tail -n 20 $LOG_FILE
+  do_cleanup
+  exit 1
 fi
-make &>> $LOGFILE
-make test &>> $LOGFILE
-make install &>> $LOGFILE
 
 # Start with returning success
 FAIL_CNT=0

scripts/test-wp-cs.sh

@@ -20,6 +20,8 @@
 #
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+source ${SCRIPT_DIR}/utils-openssl.sh
+
 CERT_DIR=$SCRIPT_DIR/../certs
 LOG_FILE=$SCRIPT_DIR/wp-cs-test.log
 
@@ -213,30 +215,6 @@ do_client_test() { # usage: do_client_test [extraArgs]
     done
 }
 
-if [ "$OPENSSL_DIR" = "" ]; then
-    if [ -x "/usr/bin/openssl" ]; then
-        OPENSSL_DIR="/usr"
-    elif [ -x "/ur/local/bin/openssl" ]; then
-        OPENSSL_DIR="/usr/local"
-    else
-        echo "Can't find OpenSSL 3.0.0"
-        exit 1
-    fi
-else
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL_DIR/lib"
-fi
-OPENSSL_BIN="$OPENSSL_DIR/bin/openssl"
-
-OSSL_VER=`$OPENSSL_BIN version`
-case $OSSL_VER in
-    OpenSSL\ 3.*) ;;
-    *)
-      echo "OpenSSL ($OPENSSL_BIN) has wrong version: $OSSL_VER"
-      echo "Set: OPENSSL_DIR"
-      exit 1
-      ;;
-esac
-
 FAIL=0
 WOLFPROV_NAME="libwolfprov"
 WOLFPROV_PATH=$PWD/.libs
@@ -246,6 +224,14 @@ CURVES=prime256v1
 OPENSSL_ALL_CIPHERS="-cipher ALL -ciphersuites $TLS13_ALL_CIPHERS"
 OPENSSL_PORT=$(generate_port)
 
+init_openssl
+if [ -z $LD_LIBRARY_PATH ]; then
+    export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
+else
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
+fi
+printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
+
 printf "\tClient testing\n" | tee $LOG_FILE
 start_openssl_server
 do_client_test "-provider-path $WOLFPROV_PATH -provider $WOLFPROV_NAME"

scripts/utils-openssl.sh

@@ -32,7 +32,7 @@ install_openssl() {
     if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then
         printf "\tClone OpenSSL ${OPENSSL_TAG} ... "
         git clone --depth=1 -b ${OPENSSL_TAG} ${OPENSSL_GIT} \
-             ${OPENSSL_SOURCE_DIR} &>> $LOGFILE
+             ${OPENSSL_SOURCE_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -44,7 +44,7 @@ install_openssl() {
     cd ${OPENSSL_SOURCE_DIR}
     if [ ! -d ${OPENSSL_INSTALL_DIR} ]; then
         printf "\tConfigure OpenSSL ${OPENSSL_TAG} ... "
-        ./config shared --prefix=${OPENSSL_INSTALL_DIR} &>> $LOGFILE
+        ./config shared --prefix=${OPENSSL_INSTALL_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -54,7 +54,7 @@ install_openssl() {
     fi
 
     printf "\tBuild OpenSSL ${OPENSSL_TAG} ... "
-    make -j$NUMCPU &>> $LOGFILE
+    make -j$NUMCPU &>> $LOG_FILE
     if [ $? != 0 ]; then
         printf "ERROR.\n"
         do_cleanup
@@ -63,7 +63,7 @@ install_openssl() {
     printf "Done.\n"
 
     printf "\tInstalling OpenSSL ${OPENSSL_TAG} ... "
-    make -j$NUMCPU install &>> $LOGFILE
+    make -j$NUMCPU install &>> $LOG_FILE
     if [ $? != 0 ]; then
         printf "ERROR.\n"
         do_cleanup

scripts/utils-wolfssl.sh

@@ -32,7 +32,7 @@ install_wolfssl() {
     if [ ! -d ${WOLFSSL_SOURCE_DIR} ]; then
         printf "\tClone wolfSSL ${WOLFSSL_TAG} ... "
         git clone --depth=1 -b ${WOLFSSL_TAG} ${WOLFSSL_GIT} \
-             ${WOLFSSL_SOURCE_DIR} &>> $LOGFILE
+             ${WOLFSSL_SOURCE_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -49,8 +49,8 @@ install_wolfssl() {
             WOLFSSL_CONFIG_CPPFLAGS=CPPFLAGS="-DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DFP_MAX_BITS=16384 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
         fi
 
-        ./autogen.sh &>> $LOGFILE
-        ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} &>> $LOGFILE
+        ./autogen.sh &>> $LOG_FILE
+        ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} &>> $LOG_FILE
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             do_cleanup
@@ -60,7 +60,7 @@ install_wolfssl() {
     fi
 
     printf "\tBuild wolfSSL ${WOLFSSL_TAG} ... "
-    make -j$NUMCPU &>> $LOGFILE
+    make -j$NUMCPU &>> $LOG_FILE
     if [ $? != 0 ]; then
         printf "ERROR.\n"
         do_cleanup
@@ -69,7 +69,7 @@ install_wolfssl() {
     printf "Done.\n"
 
     printf "\tInstalling wolfSSL ${WOLFSSL_TAG} ... "
-    make -j$NUMCPU install &>> $LOGFILE
+    make -j$NUMCPU install &>> $LOG_FILE
     if [ $? != 0 ]; then
         printf "ERROR.\n"
         do_cleanup