Add correct deb testing for replace default

Author: Test User

.github/workflows/debian-package.yml

@@ -54,12 +54,9 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Download wolfProvider packages from nightly build
-        uses: dawidd6/action-download-artifact@v6
+      - name: Download packages from build job
+        uses: actions/download-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          workflow: build-wolfprovider-nightly.yml
-          branch: build-wolfprov-debian-test
           name: debian-packages-${{ matrix.fips_ref }}${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}
           path: /tmp/packages
 
@@ -69,19 +66,22 @@ jobs:
           mv /tmp/packages/openssl-packages ${{ env.OPENSSL_PACKAGES_PATH }}
           mv /tmp/packages/wolfprov-packages ${{ env.WOLFPROV_PACKAGES_PATH }}
 
-      - name: Install package without custom openssl
+      - name: Install wolfSSL/OpenSSL/wolfprov packages
         run: |
           printf "Installing OpenSSL/wolfProvider packages (${{ matrix.fips_ref }}):\n"
           ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
+          ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
           ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
 
-          apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
+          apt install --reinstall -y \
             ${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
 
-          apt-get update && \
-            apt install --reinstall -y openssl libssl3
-
           apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
+            ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
+
+          apt install --reinstall -y \
             ${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
 
       - name: Verify wolfProvider is properly installed
@@ -186,7 +186,6 @@ jobs:
 
           echo "Package uninstallation and cleanup verification successful"
 
-
   libwolfprov-replace-default:
     runs-on: ubuntu-22.04
     needs: build_wolfprovider
@@ -209,12 +208,9 @@ jobs:
       WOLFPROV_PACKAGES_PATH: /tmp/wolfprov-packages
       WOLFPROV_CONF_FILE: /etc/ssl/openssl.cnf.d/wolfprovider.conf
     steps:
-      - name: Download wolfProvider packages from nightly build
-        uses: dawidd6/action-download-artifact@v6
+      - name: Download packages from build job
+        uses: actions/download-artifact@v4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          workflow: build-wolfprovider-nightly.yml
-          branch: build-wolfprov-debian-test
           name: debian-packages-${{ matrix.fips_ref }}${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}
           path: /tmp/packages
 
@@ -231,14 +227,17 @@ jobs:
           ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
           ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
 
-          apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
+          apt install --reinstall -y \
             ${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
 
           apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
             ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
             ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
             ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
 
+          apt install --reinstall -y \
+            ${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
+
       - name: Show OpenSSL version
         run: |
           echo "OpenSSL version:"

.github/workflows/git-ssh-dr.yml

@@ -21,8 +21,8 @@ jobs:
       matrix:
         wolfssl_ref: [ 'v5.8.2-stable' ]
         openssl_ref: [ 'openssl-3.5.2' ]
+        fips_ref: [ 'FIPS', 'non-FIPS' ]
         replace_default: [ true ]
-        fips: [ false ]
 
   git-ssh-default-replace-test:
     runs-on: ubuntu-22.04
@@ -37,8 +37,8 @@ jobs:
       matrix:
         wolfssl_ref: [ 'v5.8.2-stable' ]
         openssl_ref: [ 'openssl-3.5.2' ]
+        fips_ref: [ 'FIPS', 'non-FIPS' ]
         replace_default: [ true ]
-        fips: [ false ]
         key_type: [ 'rsa', 'ecdsa', 'ed25519', 'chacha20-poly1305' ]
         force_fail: [ 'WOLFPROV_FORCE_FAIL=1', '' ]
         iterations: [ 10 ] # Total of 50 runs
@@ -53,38 +53,41 @@ jobs:
       with:
         fetch-depth: 1
 
-    - name: Checking OpenSSL/wolfProvider packages in cache
-      uses: actions/cache/restore@v4
-      id: wolfprov-cache
+    - name: Download packages from build job
+      uses: actions/download-artifact@v4
       with:
-        path: |
-          ${{ env.WOLFSSL_PACKAGES_PATH }}
-          ${{ env.OPENSSL_PACKAGES_PATH }}
-          ${{ env.WOLFPROV_PACKAGES_PATH }}
-        key: openssl-wolfprov-debian-packages-${{ github.sha }}${{ matrix.replace_default && '-replace-default' || '' }}
-        fail-on-cache-miss: true
+        name: debian-packages-${{ matrix.fips_ref }}${{ matrix.replace_default && '-replace-default' || '' }}-${{ matrix.wolfssl_ref }}-${{ matrix.openssl_ref }}
+        path: /tmp/packages
+
+    - name: Setup package directories
+      run: |
+        mv /tmp/packages/wolfssl-packages ${{ env.WOLFSSL_PACKAGES_PATH }}
+        mv /tmp/packages/openssl-packages ${{ env.OPENSSL_PACKAGES_PATH }}
+        mv /tmp/packages/wolfprov-packages ${{ env.WOLFPROV_PACKAGES_PATH }}
 
     - name: Install wolfSSL/OpenSSL/wolfprov packages
       run: |
-        printf "Installing OpenSSL/wolfProvider packages:\n"
+        printf "Installing OpenSSL/wolfProvider packages (${{ matrix.fips_ref }}):\n"
         ls -la ${{ env.WOLFSSL_PACKAGES_PATH }}
         ls -la ${{ env.OPENSSL_PACKAGES_PATH }}
         ls -la ${{ env.WOLFPROV_PACKAGES_PATH }}
 
-        apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
+        apt install --reinstall -y \
           ${{ env.WOLFSSL_PACKAGES_PATH }}/libwolfssl_*.deb
 
         apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
           ${{ env.OPENSSL_PACKAGES_PATH }}/openssl_*.deb \
           ${{ env.OPENSSL_PACKAGES_PATH }}/libssl3_*.deb \
           ${{ env.OPENSSL_PACKAGES_PATH }}/libssl-dev_*.deb
 
-        apt install --reinstall -y --allow-downgrades --allow-change-held-packages \
+        apt install --reinstall -y \
           ${{ env.WOLFPROV_PACKAGES_PATH }}/libwolfprov_*.deb
 
     - name: Verify wolfProvider is properly installed
       run: |
-        $GITHUB_WORKSPACE/scripts/verify-install.sh ${{ matrix.replace_default && '--replace-default' || '' }} ${{ matrix.fips && '--fips' || '' }}
+        $GITHUB_WORKSPACE/scripts/verify-install.sh \
+          ${{ matrix.replace_default && '--replace-default' || '' }} \
+          ${{ matrix.fips_ref == 'FIPS' && '--fips' || '' }}
 
     - name: Set up environment
       run: |