Skip to content

Fix nightly FIPS scripts CI: RPATH, dynamic wolfSSL tag, better FIPS errors #401

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

Open
aidangarske wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −3
Open

Fix nightly FIPS scripts CI: RPATH, dynamic wolfSSL tag, better FIPS errors #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6ca8e1
Bake RPATH into OpenSSL build so binaries self-locate libssl/libcrypto
aidangarske May 25, 2026
5599bed
Dump FIPS check script log on failure for actionable error reporting
aidangarske May 25, 2026
190b6d0
Resolve WOLFSSL_TAG default dynamically instead of hand-bumping
aidangarske May 25, 2026
3881f28
Fix bash printf misreading '---' as option in FIPS log dump
aidangarske May 25, 2026
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
4 changes: 2 additions & 2 deletions scripts/utils-openssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ source ${SCRIPT_DIR}/utils-general.sh
OPENSSL_GIT_URL="https://github.com/openssl/openssl.git"
OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.5.4"}
OPENSSL_SOURCE_DIR=${SCRIPT_DIR}/../openssl-source
OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
OPENSSL_INSTALL_DIR=$(cd "${SCRIPT_DIR}/.." && pwd -P)/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_CFLAGS=${OPENSSL_CFLAGS:-""}
OPENSSL_CXXFLAGS=${OPENSSL_CXXFLAGS:-""}
OPENSSL_LDFLAGS=${OPENSSL_LDFLAGS:-""}
OPENSSL_LDFLAGS=${OPENSSL_LDFLAGS:-"-Wl,-rpath,${OPENSSL_INSTALL_DIR}/lib -Wl,-rpath,${OPENSSL_INSTALL_DIR}/lib64"}

NUMCPU=${NUMCPU:-8}
WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
Expand Down
24 changes: 23 additions & 1 deletion scripts/utils-wolfssl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,22 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
source ${SCRIPT_DIR}/utils-general.sh

WOLFSSL_GIT=${WOLFSSL_GIT:-"https://github.com/wolfSSL/wolfssl.git"}
WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.8.4-stable"}
# Resolve WOLFSSL_TAG dynamically so we don't have to hand-bump on every release.
# Order: explicit WOLFSSL_TAG (caller override) -> WOLFSSL_LATEST (Jenkins "Resolve
# versions" stage already sets this with zero extra HTTP cost) -> GitHub releases
# API (for local runs without Jenkins) -> hardcoded floor as a last-resort safety
# net in case GitHub is unreachable.
if [ -z "$WOLFSSL_TAG" ]; then
if [ -n "$WOLFSSL_LATEST" ]; then
WOLFSSL_TAG="$WOLFSSL_LATEST"
else
WOLFSSL_TAG=$(curl -fsSL https://api.github.com/repos/wolfSSL/wolfssl/releases/latest 2>/dev/null \
| grep -oE '"tag_name"[[:space:]]*:[[:space:]]*"[^"]+"' \
| head -1 \
| sed -E 's/.*"([^"]+)"$/\1/')
fi
fi
WOLFSSL_TAG="${WOLFSSL_TAG:-v5.9.1-stable}"
WOLFSSL_SOURCE_DIR=${SCRIPT_DIR}/../wolfssl-source
WOLFSSL_INSTALL_DIR=${SCRIPT_DIR}/../wolfssl-install
WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0}
Expand Down Expand Up @@ -235,6 +250,13 @@ install_wolfssl() {
fi
if [ $RET_CODE != 0 ]; then
printf "ERROR checking out FIPS (return code: $RET_CODE)\n"
if [ -f "$LOG_FILE" ]; then
echo ""
echo "==> $fips_check_script output:"
cat "$LOG_FILE"
echo "==> end $fips_check_script output"
echo ""
fi
rm -rf ${WOLFSSL_INSTALL_DIR}
do_cleanup
exit 1
Expand Down
Loading