Build openssl before wolfssl

Author: padelsbach

.github/workflows/build-wolfprovider.yml

@@ -131,6 +131,19 @@ jobs:
       #     mv ${{ env.WOLFSSL_PACKAGES_PATH }}/debian-packages/* ${{ env.WOLFSSL_PACKAGES_PATH }}
       #     apt install -y ${{ env.WOLFSSL_PACKAGES_PATH }}/*.deb
 
+      - name: Install baseline openssl
+        run: |
+          apt-get install --allow-downgrades --reinstall \
+            libssl3=3.0.17-1~deb12u2 \
+            libssl-dev=3.0.17-1~deb12u2 \
+            openssl=3.0.17-1~deb12u2
+
+      - name: Build wolfSSL packages and install
+        # if: steps.wolfssl_cache.outputs.cache-hit != 'true'
+        run: | 
+          # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }}
+          $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }}
+
       # Check for cached OpenSSL packages
       - name: Checking OpenSSL packages in cache
         uses: actions/cache@v4
@@ -175,19 +188,6 @@ jobs:
           ls -la ${{ env.WOLFSSL_PACKAGES_PATH }} || true
           ls -la ${{ env.OPENSSL_PACKAGES_PATH }} || true
 
-      - name: Install openssl packages for include files
-        run: |
-          apt install --reinstall -y \
-            ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
-            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
-            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
-
-      - name: Build wolfSSL packages and install
-        # if: steps.wolfssl_cache.outputs.cache-hit != 'true'
-        run: | 
-          # $GITHUB_WORKSPACE/debian/install-wolfssl.sh --tag ${{ inputs.wolfssl_ref }} ${{ env.WOLFSSL_PACKAGES_PATH }}
-          $GITHUB_WORKSPACE/debian/install-wolfssl.sh ${{ env.WOLFSSL_PACKAGES_PATH }}
-
       - name: Save to cache
         uses: actions/cache/save@v4
         continue-on-error: true

debian/install-wolfssl.sh

@@ -153,11 +153,11 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac
         --enable-shake256 \
         --enable-wolfprovider \
         --enable-rsapss \
-        --enable-scrypt" \
+        --enable-scrypt \
         --enable-keylog-export \
-        --enable-debug-trace-errcodes=backtrace" \
-        --with-max-ecc-bits=1024" \
-        --enable-sha
+        --enable-debug-trace-errcodes=backtrace \
+        --with-max-ecc-bits=1024 \
+        --enable-sha"
 
     if [ "$debug_mode" = "true" ]; then
         configure_opts="$configure_opts --enable-debug"
@@ -183,10 +183,10 @@ AC_CONFIG_FILES([debian/rules],[chmod +x debian/rules])' configure.ac
             -DWC_RSA_DIRECT \
             -DWC_RSA_NO_PADDING \
             -DACVP_VECTOR_TESTING \
-            -DWOLFSSL_ECDSA_SET_K" \
+            -DWOLFSSL_ECDSA_SET_K \
             -DHAVE_PUBLIC_FFDHE \
             -DWOLFSSL_PSS_LONG_SALT \
-            -DWOLFSSL_LOGGINGENABLED_DEFAULT=1 \
+            -DWOLFSSL_LOGGINGENABLED_DEFAULT=1" \
             LIBS="-lm"
 
     # Build Debian packages