New test framework for standlone binary testing, including tests validating the default swap works as expected.

ColtonWilley · ColtonWilley · commit d81f133f5049 · 2025-08-18T12:32:37.000-07:00
diff --git a/Makefile.am b/Makefile.am
@@ -19,6 +19,15 @@ if BUILD_REPLACE_DEFAULT
 lib_LTLIBRARIES += libdefault.la
 libdefault_la_SOURCES = src/wp_default_replace.c
 libdefault_la_LIBADD = libwolfprov.la
+
+# Install libdefault.so to OpenSSL lib directory for replace-default builds
+install-exec-hook:
+	@echo "Installing libdefault.so to OpenSSL lib directory..."
+	$(INSTALL) -m 755 "$(DESTDIR)$(libdir)/libdefault.so" "$(OPENSSL_LIB_DIR)/libdefault.so"
+
+uninstall-hook:
+	@echo "Removing libdefault.so from OpenSSL lib directory..."
+	rm -f "$(OPENSSL_LIB_DIR)/libdefault.so"
 endif
 
 EXTRA_DIST+=ChangeLog.md
diff --git a/configure.ac b/configure.ac
@@ -132,6 +132,18 @@ AC_ARG_ENABLE([replace-default],
 
 AM_CONDITIONAL([BUILD_REPLACE_DEFAULT], [test "x$ENABLED_REPLACE_DEFAULT" = "xyes"])
 
+# Set OpenSSL lib directory for installing libdefault.so
+if test "x$ENABLED_REPLACE_DEFAULT" = "xyes"; then
+    if test -d "$OPENSSL_INSTALL_DIR/lib64"; then
+        OPENSSL_LIB_DIR="$OPENSSL_INSTALL_DIR/lib64"
+    elif test -d "$OPENSSL_INSTALL_DIR/lib"; then
+        OPENSSL_LIB_DIR="$OPENSSL_INSTALL_DIR/lib"
+    else
+        OPENSSL_LIB_DIR="$OPENSSL_INSTALL_DIR/lib"
+    fi
+fi
+AC_SUBST([OPENSSL_LIB_DIR])
+
 
 AX_HARDEN_CC_COMPILER_FLAGS
 
diff --git a/scripts/build-wolfprovider.sh b/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"
+  echo "  --distclean                Remove source and install directories of OpenSSL, wolfSSL, and wolfProvider"
   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"
@@ -30,7 +30,7 @@ show_help() {
   echo "  WOLFSSL_FIPS_VERSION       Version of wolfSSL FIPS bundle (v5, v6, ready), used as an argument for --enable-fips when configuring wolfSSL"
   echo "  WOLFSSL_FIPS_CHECK_TAG     Tag for wolfSSL FIPS bundle (linuxv5.2.1, v6.0.0, etc), used as an argument for fips-check.sh when cloning a wolfSSL FIPS version"
   echo "  WOLFPROV_CLEAN             If set to 1, run make clean in OpenSSL, wolfSSL, and wolfProvider"
-  echo "  WOLFPROV_DISTCLEAN         If set to 1, remove the source directories of OpenSSL and wolfSSL"
+  echo "  WOLFPROV_DISTCLEAN         If set to 1, remove the source and install directories of OpenSSL, wolfSSL, and wolfProvider"
   echo "  WOLFPROV_DEBUG             If set to 1, builds OpenSSL, wolfSSL, and wolfProvider with debug options enabled"
   echo "  WOLFPROV_QUICKTEST         If set to 1, disables some tests in the test suite to increase test speed"
   echo "  WOLFPROV_DISABLE_ERR_TRACE If set to 1, wolfSSL will not be configured with --enable-debug-trace-errcodes=backtrace"
diff --git a/scripts/env-setup b/scripts/env-setup
@@ -33,9 +33,9 @@ echo "PWD: $PWD"
 
 # Detect the openssl library path
 if [ -d $REPO_ROOT/openssl-install/lib ]; then
-    OPENSSL_LIB_PATH=$REPO_ROOT/openssl-install/lib
+    export OPENSSL_LIB_PATH=$REPO_ROOT/openssl-install/lib
 elif [ -d $REPO_ROOT/openssl-install/lib64 ]; then
-    OPENSSL_LIB_PATH=$REPO_ROOT/openssl-install/lib64
+    export OPENSSL_LIB_PATH=$REPO_ROOT/openssl-install/lib64
 else
     echo "Error: Could not find OpenSSL lib directory in $REPO_ROOT/openssl-install"
     exit 1
diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh
@@ -50,6 +50,8 @@ clean_openssl() {
     if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
         printf "Removing OpenSSL source ...\n"
         rm -rf "${OPENSSL_SOURCE_DIR}"
+        printf "Removing OpenSSL install ...\n"
+        rm -rf "${OPENSSL_INSTALL_DIR}"
     fi
 }
 
diff --git a/scripts/utils-wolfprovider.sh b/scripts/utils-wolfprovider.sh
@@ -106,17 +106,32 @@ clean_wolfprov() {
         fi
         rm -rf ${WOLFPROV_INSTALL_DIR}
     fi
+    if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
+        printf "Removing wolfProvider install ...\n"
+        rm -rf ${WOLFPROV_INSTALL_DIR}
+        rm -rf ${LIBDEFAULT_STUB_INSTALL_DIR}
+    fi
 }
 
 install_wolfprov() {
     cd ${WOLFPROV_SOURCE_DIR}
 
+    # Add stub library path for replace-default functionality after dependencies are installed
+    if [ "$WOLFPROV_REPLACE_DEFAULT" = "1" ]; then
+        if [ -z "$LD_LIBRARY_PATH" ]; then
+            export LD_LIBRARY_PATH="${LIBDEFAULT_STUB_INSTALL_DIR}/lib"
+        else
+            export LD_LIBRARY_PATH="${LIBDEFAULT_STUB_INSTALL_DIR}/lib:$LD_LIBRARY_PATH"
+        fi
+    fi
+
     init_openssl
     init_wolfssl
 
     printf "\nConsolidating wolfProvider ...\n"
     unset OPENSSL_MODULES
     unset OPENSSL_CONF
+
     printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 
     printf "\tConfigure wolfProvider ... "
@@ -130,12 +145,6 @@ install_wolfprov() {
 
     if [ "$WOLFPROV_REPLACE_DEFAULT" = "1" ]; then
         WOLFPROV_CONFIG_OPTS+=" --enable-replace-default"
-        # Add stub library path for replace-default functionality
-        if [ -z "$LD_LIBRARY_PATH" ]; then
-            export LD_LIBRARY_PATH="${LIBDEFAULT_STUB_INSTALL_DIR}/lib"
-        else
-            export LD_LIBRARY_PATH="${LIBDEFAULT_STUB_INSTALL_DIR}/lib:$LD_LIBRARY_PATH"
-        fi
     fi
 
     ./configure ${WOLFPROV_CONFIG_OPTS} CFLAGS="${WOLFPROV_CONFIG_CFLAGS}" >>$LOG_FILE 2>&1
diff --git a/scripts/utils-wolfssl.sh b/scripts/utils-wolfssl.sh
@@ -49,6 +49,8 @@ clean_wolfssl() {
     if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then
         printf "Removing wolfSSL source ...\n"
         rm -rf "${WOLFSSL_SOURCE_DIR}"
+        printf "Removing wolfSSL install ...\n"
+        rm -rf "${WOLFSSL_INSTALL_DIR}"
     fi
 }
 
@@ -72,7 +74,10 @@ clone_wolfssl() {
             DEPTH_ARG=${WOLFPROV_DEBUG:+""}
             DEPTH_ARG=${DEPTH_ARG:---depth=1}
 
-            git clone ${DEPTH_ARG} -b ${CLONE_TAG} ${WOLFSSL_GIT} ${WOLFSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
+            # If we are replacing default provider, our current built openssl still
+            # links to the default stub and is non-functional. Run the clone with
+            # no explicitly LD_LIBRARY_PATH to ensure use of global openssl for clone
+            LD_LIBRARY_PATH="" git clone ${DEPTH_ARG} -b ${CLONE_TAG} ${WOLFSSL_GIT} ${WOLFSSL_SOURCE_DIR} >>$LOG_FILE 2>&1
             RET=$?
 
             if [ $RET != 0 ]; then
diff --git a/test/include.am b/test/include.am
@@ -35,3 +35,5 @@ test_unit_test_SOURCES = \
 test_unit_test_LDADD = libwolfprov.la
 noinst_HEADERS += test/unit.h
 
+# Include standalone binary tests
+include test/standalone/include.am
diff --git a/test/standalone/include.am b/test/standalone/include.am
@@ -0,0 +1,36 @@
+# vim:ft=automake
+# included from test/include.am
+# All paths should be given relative to the root
+
+# Standalone test programs use no extension - simple and clean!
+
+# Common standalone test headers
+noinst_HEADERS += test/standalone/test_common.h
+
+# Standalone test programs
+# Each test compiles to its own binary for isolated execution
+check_PROGRAMS += test/sha256_simple.test test/hardload.test
+noinst_PROGRAMS += test/sha256_simple.test test/hardload.test
+DISTCLEANFILES += test/.libs/sha256_simple.test test/.libs/hardload.test
+
+# Common flags for all standalone tests
+STANDALONE_COMMON_CPPFLAGS = -DCERTS_DIR='"$(abs_top_srcdir)/certs"' \
+                            -I$(srcdir)/test/standalone
+STANDALONE_COMMON_LDADD = libwolfprov.la
+
+# Individual test configurations
+test_sha256_simple_test_CPPFLAGS = $(STANDALONE_COMMON_CPPFLAGS)
+test_sha256_simple_test_SOURCES = test/standalone/tests/sha256_simple/test_sha256_simple.c
+test_sha256_simple_test_LDADD = $(STANDALONE_COMMON_LDADD)
+
+test_hardload_test_CPPFLAGS = $(STANDALONE_COMMON_CPPFLAGS)
+test_hardload_test_SOURCES = test/standalone/tests/hardload/test_hardload.c
+test_hardload_test_LDADD = $(STANDALONE_COMMON_LDADD)
+
+# Common test utilities are built automatically by automake
+
+# Add standalone tests to the test suite
+# We'll run these through our multi-environment runner manually
+# TESTS += test/sha256_simple.test
+
+# Note: test results are cleaned by the test runner automatically
diff --git a/test/standalone/provider-default.conf b/test/standalone/provider-default.conf
@@ -0,0 +1,10 @@
+openssl_conf = openssl_init
+
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+default = default_sect
+
+[default_sect]
+activate = 1
diff --git a/test/standalone/runners/run_standalone_tests.sh b/test/standalone/runners/run_standalone_tests.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+# run_standalone_tests.sh - Master runner for all standalone tests
+
+set -e
+
+# Get the directory of this script and find the root
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+
+echo "Running all standalone tests..."
+echo "================================"
+
+TOTAL_FAILURES=0
+
+# Run SHA256 simple test
+echo ""
+echo "Running SHA256 simple test..."
+set +e
+"$ROOT_DIR/test/standalone/tests/sha256_simple/run.sh"
+if [ $? -eq 0 ]; then
+    echo "SHA256 simple test: PASSED"
+else
+    echo "SHA256 simple test: FAILED"
+    TOTAL_FAILURES=$((TOTAL_FAILURES + 1))
+fi
+set -e
+
+# Run hardload test
+echo ""
+echo "Running hardload test..."
+set +e
+"$ROOT_DIR/test/standalone/tests/hardload/run.sh"
+if [ $? -eq 0 ]; then
+    echo "Hardload test: PASSED"
+else
+    echo "Hardload test: FAILED"
+    TOTAL_FAILURES=$((TOTAL_FAILURES + 1))
+fi
+set -e
+
+echo ""
+echo "================================"
+if [ $TOTAL_FAILURES -eq 0 ]; then
+    echo "All standalone tests passed!"
+    exit 0
+else
+    echo "$TOTAL_FAILURES standalone test(s) failed"
+    exit 1
+fi
diff --git a/test/standalone/test_common.h b/test/standalone/test_common.h
@@ -0,0 +1,89 @@
+/* test_common.h
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfProvider.
+ *
+ * wolfProvider is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfProvider is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with wolfProvider. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef WOLFPROV_USER_SETTINGS
+#include <user_settings.h>
+#endif
+#include <wolfssl/options.h>
+#include <wolfssl/wolfcrypt/wc_port.h>
+
+#include <wolfprovider/settings.h>
+#include <wolfprovider/wp_logging.h>
+
+/* Test result codes */
+#define TEST_SUCCESS    0
+#define TEST_FAILURE    1
+
+/* Debug printing macros */
+#define TEST_INFO(fmt, ...)    printf("[INFO] " fmt "\n", ##__VA_ARGS__)
+#define TEST_ERROR(fmt, ...)   fprintf(stderr, "[ERROR] " fmt "\n", ##__VA_ARGS__)
+#define TEST_DEBUG(fmt, ...)   do { \
+    if (getenv("TEST_DEBUG")) { \
+        printf("[DEBUG] " fmt "\n", ##__VA_ARGS__); \
+    } \
+} while(0)
+
+/* Buffer printing for debugging */
+#ifdef WOLFPROV_DEBUG
+#define TEST_PRINT_BUFFER(desc, buf, len) test_print_buffer(desc, buf, len)
+static inline void test_print_buffer(const char *desc, const unsigned char *buffer, size_t len)
+{
+    size_t i;
+    printf("[BUFFER] %s (%zu bytes):\n", desc, len);
+    for (i = 0; i < len; i++) {
+        printf("%02x ", buffer[i]);
+        if ((i % 16) == 15) {
+            printf("\n");
+        }
+    }
+    if ((i % 16) != 0) {
+        printf("\n");
+    }
+    printf("\n");
+}
+#else
+#define TEST_PRINT_BUFFER(desc, buf, len)
+#endif
+
+/* Utility functions */
+static inline int test_bytes_to_hex(const unsigned char *bytes, size_t len, char *hex, size_t hex_size)
+{
+    size_t i;
+    
+    if (hex_size < (len * 2 + 1)) {
+        TEST_ERROR("Hex buffer too small");
+        return TEST_FAILURE;
+    }
+    
+    for (i = 0; i < len; i++) {
+        sprintf(hex + (i * 2), "%02x", bytes[i]);
+    }
+    hex[len * 2] = '\0';
+    
+    return TEST_SUCCESS;
+}
+
+#endif /* TEST_COMMON_H */
diff --git a/test/standalone/tests/.libs/test_sha256_simple.standalone b/test/standalone/tests/.libs/test_sha256_simple.standalone
diff --git a/test/standalone/tests/hardload/run.sh b/test/standalone/tests/hardload/run.sh
diff --git a/test/standalone/tests/hardload/test_hardload.c b/test/standalone/tests/hardload/test_hardload.c
diff --git a/test/standalone/tests/sha256_simple/run.sh b/test/standalone/tests/sha256_simple/run.sh
diff --git a/test/standalone/tests/sha256_simple/test_sha256_simple.c b/test/standalone/tests/sha256_simple/test_sha256_simple.c

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ clean_openssl() {`
`50`	`50`	`if [ "$WOLFPROV_DISTCLEAN" -eq "1" ]; then`
`51`	`51`	`printf "Removing OpenSSL source ...\n"`
`52`	`52`	`rm -rf "${OPENSSL_SOURCE_DIR}"`
	`53`	`+ printf "Removing OpenSSL install ...\n"`
	`54`	`+ rm -rf "${OPENSSL_INSTALL_DIR}"`
`53`	`55`	`fi`
`54`	`56`	`}`
`55`	`57`