Skip to content

Minor cleanup in utils-openssl.sh #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ColtonWilley merged 1 commit into from
Aug 21, 2025
Merged

Minor cleanup in utils-openssl.sh #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/env-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fi
export OPENSSL_CONF="${OPENSSL_CONF:=$DEFAULT_PROVIDER_CONF}"

export OPENSSL_MODULES="${OPENSSL_MODULES:=$WOLFPROV_LIB_PATH}"
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:=$OPENSSL_LIB_PATH/pkgconfig}"
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:=$OPENSSL_LIB_PATH/pkgconfig:$REPO_ROOT/libdefault-stub-install/lib}"

# Other variables used by test scripts
export WOLFPROV_PATH="${WOLFPROV_LIB_PATH}"
Expand Down
23 changes: 7 additions & 16 deletions scripts/utils-openssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
OPENSSL_BIN=${OPENSSL_INSTALL_DIR}/bin/openssl
OPENSSL_TEST=${OPENSSL_SOURCE_DIR}/test
OPENSSL_LIB_DIRS="${OPENSSL_INSTALL_DIR}/lib:${OPENSSL_INSTALL_DIR}/lib64"
OPENSSL_STUB_INSTALL_DIR=${SCRIPT_DIR}/../libdefault-stub-install

NUMCPU=${NUMCPU:-8}
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
Expand Down Expand Up @@ -178,31 +179,21 @@ install_openssl() {
CONFIG_CMD+=" no-external-tests no-tests"

# Set up library paths to find the stub libdefault
STUB_LIB_DIR=${SCRIPT_DIR}/../libdefault-stub-install/lib
if [ -d "${STUB_LIB_DIR}" ]; then
export PKG_CONFIG_PATH="${STUB_LIB_DIR}/pkgconfig:${PKG_CONFIG_PATH}"
if [ -d "${OPENSSL_STUB_INSTALL_DIR}" ]; then
# Link the stub library directly into libcrypto using LDFLAGS and LDLIBS
CONFIGURE_LDFLAGS="-L${STUB_LIB_DIR}"
CONFIGURE_LDFLAGS="-L${OPENSSL_STUB_INSTALL_DIR}/lib"
CONFIGURE_LDLIBS="-ldefault"
else
printf "ERROR - stub libdefault not found in: ${STUB_LIB_DIR}\n"
printf "ERROR - stub libdefault not found in: ${OPENSSL_STUB_INSTALL_DIR}\n"
do_cleanup
exit 1
fi
fi

# Execute configure
if [ "$WOLFPROV_REPLACE_DEFAULT" = "1" ]; then
$CONFIG_CMD LDFLAGS="${CONFIGURE_LDFLAGS}" LDLIBS="${CONFIGURE_LDLIBS}" >>$LOG_FILE 2>&1
else
$CONFIG_CMD >>$LOG_FILE 2>&1
CONFIG_CMD+=" LDFLAGS=${CONFIGURE_LDFLAGS} LDLIBS=${CONFIGURE_LDLIBS}"
fi
RET=$?

# Clean up environment
if [ "$WOLFPROV_REPLACE_DEFAULT" = "1" ]; then
unset LDFLAGS
fi
$CONFIG_CMD >>$LOG_FILE 2>&1
RET=$?
if [ $RET != 0 ]; then
printf "ERROR.\n"
rm -rf ${OPENSSL_INSTALL_DIR}
Expand Down
Loading