From 5d34ffc2c258be545109ac41e0565fe04091205f Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Wed, 11 Jun 2025 12:53:28 -0700 Subject: [PATCH 1/4] Verify that wolfProvider loads --- .github/workflows/cjose.yml | 7 ++++--- .github/workflows/curl.yml | 4 ++++ .github/workflows/grpc.yml | 4 ++++ .github/workflows/iperf.yml | 9 +++++---- .github/workflows/ipmitool.yml | 6 +++++- .github/workflows/liboauth2.yml | 4 ++++ .github/workflows/net-snmp.yml | 5 +++++ .github/workflows/nginx.yml | 9 ++++++++- .github/workflows/openldap.yml | 4 ++++ .github/workflows/openssh.yml | 4 ++++ .github/workflows/openvpn.yml | 4 ++++ .github/workflows/socat.yml | 4 ++++ .github/workflows/sssd.yml | 4 ++++ .github/workflows/stunnel.yml | 4 ++++ 14 files changed, 63 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cjose.yml b/.github/workflows/cjose.yml index 80f8798b..dfcb165c 100644 --- a/.github/workflows/cjose.yml +++ b/.github/workflows/cjose.yml @@ -2,7 +2,7 @@ name: cjose Tests # START OF COMMON SECTION on: - push: + push: branches: [ 'master', 'main', 'release/**' ] pull_request: branches: [ '*' ] @@ -98,8 +98,9 @@ jobs: export ${{ matrix.force_fail }} export SHELL=/bin/bash - # Verify OpenSSL loads wolfProvider - $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | grep libwolfprov + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests make test || true diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index e3d61342..fa70e94d 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -98,6 +98,10 @@ jobs: export ${{ matrix.force_fail }} export CURL_REF=${{ matrix.curl_ref }} + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Run tests and save output to test.log mkdir -p tests make -j$(nproc) test-ci 2>&1 | tee tests/test.log diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index bdeb2490..6e10f67c 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -99,6 +99,10 @@ jobs: export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Initialize submodules git submodule update --init diff --git a/.github/workflows/iperf.yml b/.github/workflows/iperf.yml index c85a882b..fdaba3d9 100644 --- a/.github/workflows/iperf.yml +++ b/.github/workflows/iperf.yml @@ -93,7 +93,7 @@ jobs: openssl rsa -in rsa_private_unprotected.pem -out rsa_private.pem -aes256 -passout 'pass:password' openssl rsa -in rsa_private.pem -pubout -out rsa_public.pem -passin 'pass:password' # Create a credentials file for iperf - # Username: mario, Password: rossi + # Username: mario, Password: rossi echo "mario,bf7a49a846d44b454a5d11e7acfaf13d138bbe0b7483aa3e050879700572709b" > credentials.csv - name: Run tests @@ -125,11 +125,12 @@ jobs: tree -L 2 fi - # Verify OpenSSL loads wolfProvider to confirm configuration above - # $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | grep libwolfprov + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Verify iperf loads OpenSSL containing wolfProvider - # ldd $IPERF3_EXECUTABLE | grep wolfProvider + ldd $IPERF3_EXECUTABLE | grep wolfProvider # Launch the iperf server in the background $IPERF3_EXECUTABLE -s \ diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index dd8d2358..543731ee 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - ipmitool_ref: [ 'master', 'c3939dac2c060651361fc71516806f9ab8c38901' ] + ipmitool_ref: [ 'master', 'IPMITOOL_1_8_19' ] wolfssl_ref: [ 'master', 'v5.8.0-stable' ] openssl_ref: [ 'openssl-3.5.0' ] steps: @@ -84,6 +84,10 @@ jobs: export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Verify ipmitool was built and linked correctly with OpenSSL ldd src/ipmitool | grep -E '(libssl|libcrypto)' ldd src/ipmievd | grep -E '(libssl|libcrypto)' diff --git a/.github/workflows/liboauth2.yml b/.github/workflows/liboauth2.yml index 68983ee3..1ef6da61 100644 --- a/.github/workflows/liboauth2.yml +++ b/.github/workflows/liboauth2.yml @@ -95,6 +95,10 @@ jobs: export PKG_CONFIG_PATH=$GITHUB_WORKSPACE/openssl-install/lib64/pkgconfig export ${{ matrix.force_fail }} + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Build and run tests make check 2>&1 | tee liboauth2-test.log TEST_RESULT=$? diff --git a/.github/workflows/net-snmp.yml b/.github/workflows/net-snmp.yml index 6ac35f37..cf7b67aa 100644 --- a/.github/workflows/net-snmp.yml +++ b/.github/workflows/net-snmp.yml @@ -89,6 +89,11 @@ jobs: export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib export ${{ matrix.force_fail }} + + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + autoconf --version | grep -P '2\.\d\d' -o > dist/autoconf-version mkdir -p tests make -j test TESTOPTS="-e agentxperl" | tee tests/test.log diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 552b68a6..27491bb3 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -79,7 +79,10 @@ jobs: - name: Build nginx working-directory: nginx run: | - ./auto/configure --with-http_ssl_module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_v2_module --with-mail --with-mail_ssl_module + ./auto/configure --with-http_ssl_module --with-stream \ + --with-stream_ssl_module --with-stream_ssl_preread_module \ + --with-http_v2_module --with-mail --with-mail_ssl_module \ + --with-openssl=$GITHUB_WORKSPACE/openssl-install make -j - name: Checkout nginx-tests @@ -98,6 +101,10 @@ jobs: export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib export ${{ matrix.force_fail }} + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Run tests and save result TEST_NGINX_VERBOSE=y TEST_NGINX_CATLOG=y TEST_NGINX_BINARY=../nginx/objs/nginx prove -v . 2>&1 | tee nginx-test.log TEST_RESULT=$? diff --git a/.github/workflows/openldap.yml b/.github/workflows/openldap.yml index 6a320b70..7d590092 100644 --- a/.github/workflows/openldap.yml +++ b/.github/workflows/openldap.yml @@ -82,6 +82,10 @@ jobs: export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Generate configure script rm -f aclocal.m4 autoreconf -ivf diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index 2dc8aade..5dfcafcd 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -86,6 +86,10 @@ jobs: export OPENSSL_CONF=$GITHUB_WORKSPACE/provider.conf export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Apply the patch for the correct version of OpenSSH if [ "${{ matrix.openssh_ref }}" != "master" ]; then patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/openssh/openssh-${{ matrix.openssh_ref }}-wolfprov.patch diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml index d67a7421..419779e4 100644 --- a/.github/workflows/openvpn.yml +++ b/.github/workflows/openvpn.yml @@ -90,6 +90,10 @@ jobs: export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib export ${{ matrix.force_fail }} + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Run tests and save result make check 2>&1 | tee openvpn-test.log TEST_RESULT=$? diff --git a/.github/workflows/socat.yml b/.github/workflows/socat.yml index 2c6960dc..7710954e 100644 --- a/.github/workflows/socat.yml +++ b/.github/workflows/socat.yml @@ -86,6 +86,10 @@ jobs: export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib export SHELL=/bin/bash + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Verify OpenSSL loads wolfProvider $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers diff --git a/.github/workflows/sssd.yml b/.github/workflows/sssd.yml index 471bb65c..a8cccbec 100644 --- a/.github/workflows/sssd.yml +++ b/.github/workflows/sssd.yml @@ -106,6 +106,10 @@ jobs: export OPENSSL_MODULES=$GITHUB_WORKSPACE/wolfprov-install/lib export ${{ matrix.force_fail }} + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Run tests and save result make check 2>&1 | tee sssd-test.log TEST_RESULT=$? diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml index 8ca3d42f..7beb7a7c 100644 --- a/.github/workflows/stunnel.yml +++ b/.github/workflows/stunnel.yml @@ -103,6 +103,10 @@ jobs: ldd src/stunnel | grep -E '(libssl|libcrypto)' ./src/stunnel -version + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Run tests and capture output mkdir -p $GITHUB_WORKSPACE/tests make check 2>&1 | tee $GITHUB_WORKSPACE/tests/stunnel-test.log From 16e6553518ba37a4fad8a4debd90606bdae91666 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Wed, 11 Jun 2025 13:19:39 -0700 Subject: [PATCH 2/4] fix iperf and nginx --- .github/workflows/iperf.yml | 11 ++++------- .github/workflows/nginx.yml | 5 +---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/iperf.yml b/.github/workflows/iperf.yml index fdaba3d9..5e897862 100644 --- a/.github/workflows/iperf.yml +++ b/.github/workflows/iperf.yml @@ -106,6 +106,10 @@ jobs: export ${{ matrix.force_fail }} export SHELL=/bin/bash + echo "Checking OpenSSL providers:" + $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log + grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + # Test variables for iperf export IPERF3_EXECUTABLE=$GITHUB_WORKSPACE/iperf/src/iperf3 export IPERF3_TEST_INTERVAL=0.1 @@ -115,7 +119,6 @@ jobs: export IPERF3_PASSWORD=rossi export KEY_DIR=$GITHUB_WORKSPACE/test-keys - # Verify IERF3_EXECUTABLE exists if [ -f "$IPERF3_EXECUTABLE" ]; then echo "iperf3 executable found: $IPERF3_EXECUTABLE" @@ -125,10 +128,6 @@ jobs: tree -L 2 fi - echo "Checking OpenSSL providers:" - $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) - # Verify iperf loads OpenSSL containing wolfProvider ldd $IPERF3_EXECUTABLE | grep wolfProvider @@ -141,5 +140,3 @@ jobs: $IPERF3_EXECUTABLE -c localhost -i $IPERF3_TEST_INTERVAL -t $IPERF3_TEST_DURATION \ --rsa-public-key-path $KEY_DIR/rsa_public.pem \ --user $IPERF3_USER | tee $IPERF3_TEST_LOG \ - - diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 27491bb3..738df3fb 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -79,10 +79,7 @@ jobs: - name: Build nginx working-directory: nginx run: | - ./auto/configure --with-http_ssl_module --with-stream \ - --with-stream_ssl_module --with-stream_ssl_preread_module \ - --with-http_v2_module --with-mail --with-mail_ssl_module \ - --with-openssl=$GITHUB_WORKSPACE/openssl-install + ./auto/configure --with-http_ssl_module --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_v2_module --with-mail --with-mail_ssl_module make -j - name: Checkout nginx-tests From 2fd5b366c4fb93686e31b97fdffe509b7d5c6117 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Wed, 11 Jun 2025 14:05:51 -0700 Subject: [PATCH 3/4] Revert iperf workflow --- .github/workflows/iperf.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/iperf.yml b/.github/workflows/iperf.yml index 5e897862..d0b9e049 100644 --- a/.github/workflows/iperf.yml +++ b/.github/workflows/iperf.yml @@ -106,10 +106,6 @@ jobs: export ${{ matrix.force_fail }} export SHELL=/bin/bash - echo "Checking OpenSSL providers:" - $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) - # Test variables for iperf export IPERF3_EXECUTABLE=$GITHUB_WORKSPACE/iperf/src/iperf3 export IPERF3_TEST_INTERVAL=0.1 @@ -119,6 +115,7 @@ jobs: export IPERF3_PASSWORD=rossi export KEY_DIR=$GITHUB_WORKSPACE/test-keys + # Verify IERF3_EXECUTABLE exists if [ -f "$IPERF3_EXECUTABLE" ]; then echo "iperf3 executable found: $IPERF3_EXECUTABLE" @@ -128,8 +125,11 @@ jobs: tree -L 2 fi + # Verify OpenSSL loads wolfProvider to confirm configuration above + # $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | grep libwolfprov + # Verify iperf loads OpenSSL containing wolfProvider - ldd $IPERF3_EXECUTABLE | grep wolfProvider + # ldd $IPERF3_EXECUTABLE | grep wolfProvider # Launch the iperf server in the background $IPERF3_EXECUTABLE -s \ From 5e5b66461a75833c6c2bd2327ef1045f83548d5c Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Wed, 11 Jun 2025 14:57:10 -0700 Subject: [PATCH 4/4] Add -q so we dont have extra logs --- .github/workflows/cjose.yml | 2 +- .github/workflows/curl.yml | 2 +- .github/workflows/grpc.yml | 2 +- .github/workflows/ipmitool.yml | 2 +- .github/workflows/liboauth2.yml | 2 +- .github/workflows/net-snmp.yml | 2 +- .github/workflows/nginx.yml | 2 +- .github/workflows/openldap.yml | 2 +- .github/workflows/openssh.yml | 2 +- .github/workflows/openvpn.yml | 2 +- .github/workflows/socat.yml | 2 +- .github/workflows/sssd.yml | 2 +- .github/workflows/stunnel.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cjose.yml b/.github/workflows/cjose.yml index dfcb165c..26310910 100644 --- a/.github/workflows/cjose.yml +++ b/.github/workflows/cjose.yml @@ -100,7 +100,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests make test || true diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index fa70e94d..5b827a65 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -100,7 +100,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests and save output to test.log mkdir -p tests diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index 6e10f67c..43e5e584 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -101,7 +101,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Initialize submodules git submodule update --init diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index 543731ee..29529346 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -86,7 +86,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Verify ipmitool was built and linked correctly with OpenSSL ldd src/ipmitool | grep -E '(libssl|libcrypto)' diff --git a/.github/workflows/liboauth2.yml b/.github/workflows/liboauth2.yml index 1ef6da61..3aa1dd6e 100644 --- a/.github/workflows/liboauth2.yml +++ b/.github/workflows/liboauth2.yml @@ -97,7 +97,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Build and run tests make check 2>&1 | tee liboauth2-test.log diff --git a/.github/workflows/net-snmp.yml b/.github/workflows/net-snmp.yml index cf7b67aa..3e8905f5 100644 --- a/.github/workflows/net-snmp.yml +++ b/.github/workflows/net-snmp.yml @@ -92,7 +92,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) autoconf --version | grep -P '2\.\d\d' -o > dist/autoconf-version mkdir -p tests diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 738df3fb..1fba1f8e 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -100,7 +100,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests and save result TEST_NGINX_VERBOSE=y TEST_NGINX_CATLOG=y TEST_NGINX_BINARY=../nginx/objs/nginx prove -v . 2>&1 | tee nginx-test.log diff --git a/.github/workflows/openldap.yml b/.github/workflows/openldap.yml index 7d590092..7468a3a1 100644 --- a/.github/workflows/openldap.yml +++ b/.github/workflows/openldap.yml @@ -84,7 +84,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Generate configure script rm -f aclocal.m4 diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index 5dfcafcd..1739d60b 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -88,7 +88,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Apply the patch for the correct version of OpenSSH if [ "${{ matrix.openssh_ref }}" != "master" ]; then diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml index 419779e4..f4663652 100644 --- a/.github/workflows/openvpn.yml +++ b/.github/workflows/openvpn.yml @@ -92,7 +92,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests and save result make check 2>&1 | tee openvpn-test.log diff --git a/.github/workflows/socat.yml b/.github/workflows/socat.yml index 7710954e..40628571 100644 --- a/.github/workflows/socat.yml +++ b/.github/workflows/socat.yml @@ -88,7 +88,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Verify OpenSSL loads wolfProvider $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers diff --git a/.github/workflows/sssd.yml b/.github/workflows/sssd.yml index a8cccbec..1c7ad756 100644 --- a/.github/workflows/sssd.yml +++ b/.github/workflows/sssd.yml @@ -108,7 +108,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests and save result make check 2>&1 | tee sssd-test.log diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml index 7beb7a7c..784525ff 100644 --- a/.github/workflows/stunnel.yml +++ b/.github/workflows/stunnel.yml @@ -105,7 +105,7 @@ jobs: echo "Checking OpenSSL providers:" $GITHUB_WORKSPACE/openssl-install/bin/openssl list -providers | tee provider-list.log - grep libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) + grep -q libwolfprov provider-list.log || (echo "ERROR: libwolfprov not found in OpenSSL providers" && exit 1) # Run tests and capture output mkdir -p $GITHUB_WORKSPACE/tests