From 4d247a3a88f39cec1468f30a5f80e278d3801690 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Wed, 5 Jun 2024 16:22:07 -0500
Subject: [PATCH] Update to mosquitto 2.0.18

---
 .github/workflows/mosquitto.yml | 66 +++++++++++----------------------
 wolfssl/openssl/ssl.h           |  2 +-
 2 files changed, 22 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/mosquitto.yml b/.github/workflows/mosquitto.yml
index 7dd49f46a1..6b4c2f0c5f 100644
--- a/.github/workflows/mosquitto.yml
+++ b/.github/workflows/mosquitto.yml
@@ -1,7 +1,16 @@
 name: mosquitto Tests
 
+# START OF COMMON SECTION
 on:
-  workflow_call:
+  push:
+    branches: [ 'master', 'main', 'release/**' ]
+  pull_request:
+    branches: [ '*' ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+# END OF COMMON SECTION
 
 jobs:
   build_wolfssl:
@@ -19,43 +28,17 @@ jobs:
           install: true
 
       - name: Upload built lib
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wolf-install-mosquitto
           path: build-dir
-          retention-days: 1
+          retention-days: 5
 
   mosquitto_check:
     strategy:
       fail-fast: false
       matrix:
-        # List of releases to test
-        include:
-          - ref: v2.0.15
-            ignore-tests: >-
-              ./01-connect-zero-length-id.py 06-bridge-reconnect-local-out.py
-              ./08-ssl-connect-cert-auth-crl.py
-              ./08-ssl-connect-cert-auth-revoked.py
-              ./08-ssl-connect-cert-auth.py
-              ./08-ssl-connect-identity.py
-              ./08-ssl-connect-no-auth.py
-              ./08-ssl-connect-no-identity.py
-              ./08-ssl-hup-disconnect.py
-              ./14-dynsec-acl.py
-              ./14-dynsec-anon-group.py
-              ./14-dynsec-auth.py
-              ./14-dynsec-client-invalid.py
-              ./14-dynsec-client.py
-              ./14-dynsec-default-access.py
-              ./14-dynsec-disable-client.py
-              ./14-dynsec-group-invalid.py
-              ./14-dynsec-group.py
-              ./14-dynsec-modify-client.py
-              ./14-dynsec-modify-group.py
-              ./14-dynsec-modify-role.py
-              ./14-dynsec-plugin-invalid.py
-              ./14-dynsec-role-invalid.py
-              ./14-dynsec-role.py
+        ref: [ 2.0.18 ]
     name: ${{ matrix.ref }}
     runs-on: ubuntu-latest
     # This should be a safe limit for the tests to run.
@@ -63,13 +46,13 @@ jobs:
     needs: build_wolfssl
     steps:
       - name: Download lib
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wolf-install-mosquitto
           path: build-dir
 
       - name: Checkout OSP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: wolfssl/osp
           path: osp
@@ -79,29 +62,22 @@ jobs:
             export DEBIAN_FRONTEND=noninteractive
             sudo apt-get update
             sudo apt-get install -y build-essential libev-dev libssl-dev automake python3-docutils libcunit1 libcunit1-doc libcunit1-dev pkg-config make
+            sudo pip install --upgrade psutil
 
       - name: Checkout mosquitto
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: eclipse/mosquitto
-          ref: v2.0.15
+          ref: v${{ matrix.ref }}
           path: mosquitto
 
-      # Do this before configuring so that it only detects the updated list of
-      # tests
-      - if: ${{ matrix.ignore-tests }}
-        name: Remove tests that we want to ignore
-        working-directory: ./mosquitto/test/broker
-        run: |
-          rm ${{ matrix.ignore-tests }}
-
       - name: Configure and build mosquitto
         run: |
             cd $GITHUB_WORKSPACE/mosquitto/
-            patch -p1 < $GITHUB_WORKSPACE/osp/mosquitto/2.0.15.patch
-            make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no
+            patch -p1 < $GITHUB_WORKSPACE/osp/mosquitto/${{ matrix.ref }}.patch
+            make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir -j
 
       - name: Run mosquitto tests, skipping ignored tests
         working-directory: ./mosquitto
         run: |
-          make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no ptest
\ No newline at end of file
+          make WITH_TLS=wolfssl WITH_CJSON=no WITH_DOCS=no WOLFSSLDIR=$GITHUB_WORKSPACE/build-dir ptest -j
\ No newline at end of file
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 48558d573b..a1c4b06e20 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -1228,7 +1228,7 @@ typedef WOLFSSL_SRTP_PROTECTION_PROFILE      SRTP_PROTECTION_PROFILE;
                                                                   (char *)(arg))
 #endif /* OPENSSL_ALL || WOLFSSL_ASIO || WOLFSSL_HAPROXY */
 
-#define SSL_CTX_set_dh_auto(ctx, arg)   wolfSSL_CTX_set_dh_auto;
+#define SSL_CTX_set_dh_auto             wolfSSL_CTX_set_dh_auto
 #define SSL_CTX_set_tmp_dh              wolfSSL_CTX_set_tmp_dh
 
 #define TLSEXT_STATUSTYPE_ocsp  1