Skip to content

Commit 0da272f

Browse files
authored
Merge pull request #166 from aidangarske/verify-provider
Verify that wolfProvider loads for all workflows
2 parents 6f79820 + 5e5b664 commit 0da272f

14 files changed

Lines changed: 55 additions & 7 deletions

File tree

.github/workflows/cjose.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: cjose Tests
22

33
# START OF COMMON SECTION
44
on:
5-
push:
5+
push:
66
branches: [ 'master', 'main', 'release/**' ]
77
pull_request:
88
branches: [ '*' ]
@@ -98,8 +98,9 @@ jobs:
9898
export ${{ matrix.force_fail }}
9999
export SHELL=/bin/bash
100100
101-
# Verify OpenSSL loads wolfProvider
102-
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | grep libwolfprov
101+
echo "Checking OpenSSL providers:"
102+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
103104
104105
# Run tests
105106
make test || true

.github/workflows/curl.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ jobs:
9898
export ${{ matrix.force_fail }}
9999
export CURL_REF=${{ matrix.curl_ref }}
100100
101+
echo "Checking OpenSSL providers:"
102+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
104+
101105
# Run tests and save output to test.log
102106
mkdir -p tests
103107
make -j$(nproc) test-ci 2>&1 | tee tests/test.log

.github/workflows/grpc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ jobs:
9999
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
100100
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
101101
102+
echo "Checking OpenSSL providers:"
103+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
104+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
105+
102106
# Initialize submodules
103107
git submodule update --init
104108

.github/workflows/iperf.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
openssl rsa -in rsa_private_unprotected.pem -out rsa_private.pem -aes256 -passout 'pass:password'
9494
openssl rsa -in rsa_private.pem -pubout -out rsa_public.pem -passin 'pass:password'
9595
# Create a credentials file for iperf
96-
# Username: mario, Password: rossi
96+
# Username: mario, Password: rossi
9797
echo "mario,bf7a49a846d44b454a5d11e7acfaf13d138bbe0b7483aa3e050879700572709b" > credentials.csv
9898
9999
- name: Run tests
@@ -140,5 +140,3 @@ jobs:
140140
$IPERF3_EXECUTABLE -c localhost -i $IPERF3_TEST_INTERVAL -t $IPERF3_TEST_DURATION \
141141
--rsa-public-key-path $KEY_DIR/rsa_public.pem \
142142
--user $IPERF3_USER | tee $IPERF3_TEST_LOG \
143-
144-

.github/workflows/ipmitool.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
ipmitool_ref: [ 'master', 'c3939dac2c060651361fc71516806f9ab8c38901' ]
34+
ipmitool_ref: [ 'master', 'IPMITOOL_1_8_19' ]
3535
wolfssl_ref: [ 'master', 'v5.8.0-stable' ]
3636
openssl_ref: [ 'openssl-3.5.0' ]
3737
steps:
@@ -84,6 +84,10 @@ jobs:
8484
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
8585
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
8686
87+
echo "Checking OpenSSL providers:"
88+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
89+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
90+
8791
# Verify ipmitool was built and linked correctly with OpenSSL
8892
ldd src/ipmitool | grep -E '(libssl|libcrypto)'
8993
ldd src/ipmievd | grep -E '(libssl|libcrypto)'

.github/workflows/liboauth2.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ jobs:
9595
export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig
9696
export ${{ matrix.force_fail }}
9797
98+
echo "Checking OpenSSL providers:"
99+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
100+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
101+
98102
# Build and run tests
99103
make check 2>&1 | tee liboauth2-test.log
100104
TEST_RESULT=$?

.github/workflows/net-snmp.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ jobs:
8989
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
9090
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
9191
export ${{ matrix.force_fail }}
92+
93+
echo "Checking OpenSSL providers:"
94+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
95+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
96+
9297
autoconf --version | grep -P '2\.\d\d' -o > dist/autoconf-version
9398
mkdir -p tests
9499
make -j test TESTOPTS="-e agentxperl" | tee tests/test.log

.github/workflows/nginx.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ jobs:
9898
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
9999
export ${{ matrix.force_fail }}
100100
101+
echo "Checking OpenSSL providers:"
102+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
103+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
104+
101105
# Run tests and save result
102106
TEST_NGINX_VERBOSE=y TEST_NGINX_CATLOG=y TEST_NGINX_BINARY=../nginx/objs/nginx prove -v . 2>&1 | tee nginx-test.log
103107
TEST_RESULT=$?

.github/workflows/openldap.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ jobs:
8282
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
8383
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
8484
85+
echo "Checking OpenSSL providers:"
86+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
87+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
88+
8589
# Generate configure script
8690
rm -f aclocal.m4
8791
autoreconf -ivf

.github/workflows/openssh.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ jobs:
8686
export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf
8787
export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib
8888
89+
echo "Checking OpenSSL providers:"
90+
$GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log
91+
grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1)
92+
8993
# Apply the patch for the correct version of OpenSSH
9094
if [ "${{ matrix.openssh_ref }}" != "master" ]; then
9195
patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/openssh/openssh-${{ matrix.openssh_ref }}-wolfprov.patch

0 commit comments

Comments
 (0)