Skip to content

wolfprovider: fix cmd-test tooling and first-run FIPS detection #169

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
ColtonWilley wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

wolfprovider: fix cmd-test tooling and first-run FIPS detection #169

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
4 changes: 3 additions & 1 deletion recipes-examples/wolfprovider/wolfprovidercmd/wolfprovidercmd.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ DEPENDS = "openssl virtual/wolfssl wolfprovider"
inherit wolfssl-compatibility

python __anonymous() {
wolfssl_varSet(d, 'RDEPENDS', '${PN}', 'bash openssl wolfprovider')
# wrapper sources wolfproviderenv and runs the openssl CLI at runtime
wolfssl_varSet(d, 'RDEPENDS', '${PN}', 'bash openssl openssl-bin wolfprovider wolfproviderenv')
}

SRC_URI = "git://github.com/wolfssl/wolfProvider.git;nobranch=1;protocol=https;rev=046f4ac583ca7612386f4c38ca29a9d191785aa8 \
Expand Down Expand Up @@ -48,6 +49,7 @@ do_install() {

# Copy env setup script to scripts/
install -m 0755 ${S}/scripts/env-setup ${WOLFPROV_CMD_TEST_INSTALL_DIR}/scripts/
install -m 0755 ${S}/scripts/utils-general.sh ${WOLFPROV_CMD_TEST_INSTALL_DIR}/scripts/

# Copy provider configuration files to root of test dir
install -m 0644 ${S}/provider.conf ${WOLFPROV_CMD_TEST_INSTALL_DIR}/
Expand Down
7 changes: 6 additions & 1 deletion recipes-examples/wolfprovider/wolfproviderenv/files/wolfproviderenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,13 @@ if [ -f /etc/wolfssl/fips-enabled ]; then
fi
fi
# Method 2: Check runtime detection for FIPS mode
# Load the module directly so detection works before openssl.cnf is seeded
# (first boot); fall back to the provider listing.
RUNTIME_FIPS=-1
PROVIDER_FIPS=$(openssl list -providers 2>/dev/null | grep "name:" | grep -i "wolfSSL Provider FIPS")
PROVIDER_FIPS=$(openssl list -providers -provider libwolfprov 2>/dev/null | grep "name:" | grep -i "wolfSSL Provider FIPS")
if [ -z "$PROVIDER_FIPS" ]; then
PROVIDER_FIPS=$(openssl list -providers 2>/dev/null | grep "name:" | grep -i "wolfSSL Provider FIPS")
fi
if [ -n "$PROVIDER_FIPS" ]; then
RUNTIME_FIPS=1
echo "Detected wolfSSL FIPS build (runtime detection)"
Expand Down