Fix curl cjose bind9

Author: aidangarske

.github/scripts/check-workflow-result.sh

@@ -293,6 +293,23 @@ if [ "$WOLFPROV_FORCE_FAIL" = "WOLFPROV_FORCE_FAIL=1" ]; then
             echo "Error: $IPERF_TEST_LOG not found"
             exit 1
         fi
+    # ----- BIND9 -----
+    elif [ "$TEST_SUITE" = "bind9" ]; then
+        if [ -f "bind9-test.log" ]; then
+            # Check for expected error count (12 errors) and non-zero exit code
+            if grep -q "ERROR: 12" bind9-test.log && [ $TEST_RESULT -ne 0 ]; then
+                echo "PASS: BIND9 tests failed as expected with force fail enabled (12 errors)"
+                exit 0
+            else
+                echo "FAIL: BIND9 tests did not fail as expected with force fail enabled"
+                echo "  Expected: 12 errors and non-zero exit code"
+                echo "  Got: $(grep 'ERROR:' bind9-test.log | tail -1) and exit code $TEST_RESULT"
+                exit 1
+            fi
+        else
+            echo "Error: bind9-test.log not found"
+            exit 1
+        fi
     else
         if [ $TEST_RESULT -eq 0 ]; then
             echo "$TEST_SUITE tests unexpectedly succeeded with force fail enabled"

.github/workflows/cjose.yml

@@ -84,11 +84,15 @@ jobs:
         run: |
           # Set up the environment for wolfProvider
           source $GITHUB_WORKSPACE/scripts/env-setup
-          export LDFLAGS="-L${OPENSSL_INSTALL}/lib64"
+          
+          # Set additional environment variables for OpenSSL
+          export OPENSSL_INSTALL=$GITHUB_WORKSPACE/openssl-install
+          export LDFLAGS="-L${OPENSSL_INSTALL}/lib64 -L${OPENSSL_INSTALL}/lib"
           export CPPFLAGS="-I${OPENSSL_INSTALL}/include"
+          export PKG_CONFIG_PATH="${OPENSSL_INSTALL}/lib64/pkgconfig:${OPENSSL_INSTALL}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 
           # Configure with OpenSSL
-          ./configure CFLAGS="-Wno-error=deprecated-declarations" --with-openssl=$GITHUB_WORKSPACE/openssl-install
+          ./configure CFLAGS="-Wno-error=deprecated-declarations" --with-openssl=$OPENSSL_INSTALL
 
           # Build cjose
           make

.github/workflows/cmdline.yml

@@ -51,7 +51,7 @@ jobs:
       # If not yet built this version, build it now
       - name: Build wolfProvider
         # Only run the test for a cache miss. On hit, we've already run the test.
-        if: steps.wolfprov-cache-restore.cache-hit != 'true'
+        if: steps.wolfprov-cache.outputs.cache-hit != 'true'
         run: |
           ${{ matrix.debug }} OPENSSL_TAG=${{ matrix.openssl_ref }} WOLFSSL_TAG=${{ matrix.wolfssl_ref }} ./scripts/build-wolfprovider.sh
 

.github/workflows/curl.yml

@@ -73,13 +73,23 @@ jobs:
           sudo apt-get install -y build-essential autoconf automake libtool \
               pkg-config nghttp2 libpsl5 libpsl-dev python3-impacket 
 
+      - name: Set up environment for curl build
+        run: |
+          # Set up the environment for wolfProvider
+          source $GITHUB_WORKSPACE/scripts/env-setup
+          echo "OPENSSL_INSTALL=$OPENSSL_INSTALL" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "CPPFLAGS=$CPPFLAGS" >> $GITHUB_ENV
+          echo "LDFLAGS=$LDFLAGS" >> $GITHUB_ENV
+
       - name: Build curl
         uses: wolfSSL/actions-build-autotools-project@v1
         with:
           repository: curl/curl
           path: curl
           ref: ${{ matrix.curl_ref }}
-          configure: --with-openssl
+          configure: --with-openssl=$OPENSSL_INSTALL
           check: false
 
       - name: Generate certificates for curl master force-fail tests

.github/workflows/simple.yml

@@ -83,7 +83,7 @@ jobs:
 
       - name: Build and test wolfProvider
         # Only run the test for a cache miss. On hit, we've already run the test.
-        if: steps.wolfprov-cache-restore.cache-hit != 'true'
+        if: steps.wolfprov-cache-restore.outputs.cache-hit != 'true'
         run: |
           ${{ matrix.debug }} \
             OPENSSL_TAG=${{ matrix.openssl_ref }} \