inline patch to osp repo

Author: JeremiahM37

.github/workflows/libtss2.yml

@@ -59,13 +59,15 @@ jobs:
           ref: ${{ matrix.tpm2_tss_ref }}
           fetch-depth: 1
 
-      # Apply patch to fix missing stdint.h includes in test files
-      # TODO: use patch from OSP repo
-      - name: Apply patch for test source files
-        working-directory: tpm2_tss_repo
-        if: ${{ matrix.tpm2_tss_ref }} == '4.1.3'
-        run: |
-          perl -pi -e 's|(#include <cmocka\.h>)|#include <stdint.h>\n$1|' ./test/unit/*.c
+      - name: Checkout OSP
+        uses: actions/checkout@v4
+        with:
+          repository: wolfssl/osp
+          path: osp
+          fetch-depth: 1
+      - run: |
+          cd tpm2_tss_repo
+          patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/libtss2/libtss2-${{ matrix.tpm2_tss_ref }}-wolfprov.patch
 
       - name: Build and install tpm2-tss
         working-directory: tpm2_tss_repo

.github/workflows/ppp.yml

@@ -97,16 +97,15 @@ jobs:
           ref: ${{ matrix.ppp_ref }}
           fetch-depth: 1
 
-      # TODO: use patch from OSP repo
-      - name: Apply PPP compatibility fixes for OpenSSL 3.x
-        working-directory: ppp_repo
-        run: |
-          # Disable testing of legacy algorithms
-          for fn in PPP_crypto_init PPP_crypto_deinit test_md4 test_des_encrypt test_des_decrypt; do
-            perl -0777 -pi -e '
-              s/\bint\s+'$fn'\s*\([^)]*\)/int '$fn'() { return 1; }\nint __attribute__((unused)) __replaced_'$fn'()/g
-            ' pppd/crypto.c
-          done
+      - name: Checkout OSP
+        uses: actions/checkout@v4
+        with:
+          repository: wolfssl/osp
+          path: osp
+          fetch-depth: 1
+      - run: |
+          cd ppp_repo
+          patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/ppp/ppp-${{ matrix.ppp_ref }}-wolfprov.patch
 
       - name: Build and install PPP
         working-directory: ppp_repo

.github/workflows/qt5network5.yml

@@ -104,6 +104,10 @@ jobs:
           ref: ${{ matrix.qt_ref }}
           fetch-depth: 1
 
+      - run: |
+          cd qt5_repo
+          patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/qtbase/qtbase-${{ matrix.qt_ref }}-wolfprov.patch
+
       - name: Configure Qt
         working-directory: qt5_repo
         run: |
@@ -117,9 +121,6 @@ jobs:
         if: matrix.qt_ref != 'dev'
         working-directory: qt5_repo
         run: |
-          # Force C++14 to avoid C++17 compatibility issues
-          echo 'QMAKE_CXXFLAGS += -std=c++14' >> mkspecs/linux-g++/qmake.conf
-
           make -k -j$(nproc)
 
       - name: Add test server to hosts

.github/workflows/x11vnc.yml

@@ -110,15 +110,19 @@ jobs:
           ref: ${{ matrix.x11vnc_ref }}
           path: x11vnc
 
+      - name: Checkout OSP
+        uses: actions/checkout@v4
+        with:
+          repository: wolfssl/osp
+          path: osp
+          fetch-depth: 1
+      - run: |
+          cd x11vnc
+          patch -p1 < $GITHUB_WORKSPACE/osp/wolfProvider/x11vnc/x11vnc-${{ matrix.x11vnc_ref }}-wolfprov.patch
+
       - name: Build x11vnc
         working-directory: x11vnc
         run: |
-          # change certs from being hashed with MD5 to SHA256
-          perl -pi -e 's/default_md\s*=\s*md5/default_md = SHA256/' src/ssltools.h
-
-          # change encryption for cert keys from des3 to aes256
-          perl -pi -e 's/-des3/-aes256/' src/ssltools.h
-
           autoreconf -vfi
           ./configure
           make -j $(nproc)