v1.19.2 release prep

wolfSSL · Jan 31, 2025 · 91a9457 · 91a9457
1 parent 7e701ba
commit 91a9457
Show file tree

Hide file tree

Showing 53 changed files with 95 additions and 87 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfMQTT VERSION 1.19.1 LANGUAGES C)
+project(wolfMQTT VERSION 1.19.2 LANGUAGES C)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions.cmake)
@@ -39,38 +39,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static on
 add_library(wolfmqtt ${MQTT_SOURCES})
 
 
-if (WITH_WOLFSSL)
-    target_link_libraries(wolfmqtt PUBLIC wolfssl)
-    target_include_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/include)
-    target_link_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/lib)
-    list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
-elseif (WITH_WOLFSSL_TREE)
-    set(WOLFSSL_EXAMPLES "no" CACHE STRING "")
-    set(WOLFSSL_CRYPT_TESTS "no" CACHE STRING "")
-
-    add_subdirectory(${WITH_WOLFSSL_TREE} wolfssl)
-    target_link_libraries(wolfmqtt PUBLIC wolfssl)
-    list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
-else()
-    find_package(PkgConfig)
-    pkg_check_modules(WOLFSSL wolfssl)
-
-    if (WOLFSSL_FOUND)
-        list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
-        target_link_libraries(wolfmqtt PUBLIC ${WOLFSSL_LIBRARIES})
-        target_include_directories(wolfmqtt PUBLIC ${WOLFSSL_INCLUDE_DIRS})
-        target_link_directories(wolfmqtt PUBLIC ${WOLFSSL_LIBRARY_DIRS})
-        target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER})
-    else()
-        # For support with vcpkg
-        find_package(wolfssl CONFIG REQUIRED)
-        if (wolfssl_FOUND)
-            list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
-            target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl)
-        endif()
-    endif()
-endif()
-
 
 set(WOLFMQTT_EXAMPLES "yes" CACHE BOOL
     "Build examples")
@@ -88,6 +56,38 @@ add_option(WOLFMQTT_TLS
            "Enable TLS support with wolfSSL"
            "yes" "yes;no")
 if (WOLFMQTT_TLS)
+    if (WITH_WOLFSSL)
+        target_link_libraries(wolfmqtt PUBLIC wolfssl)
+        target_include_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/include)
+        target_link_directories(wolfmqtt PUBLIC ${WITH_WOLFSSL}/lib)
+        list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
+    elseif (WITH_WOLFSSL_TREE)
+        set(WOLFSSL_EXAMPLES "no" CACHE STRING "")
+        set(WOLFSSL_CRYPT_TESTS "no" CACHE STRING "")
+
+        add_subdirectory(${WITH_WOLFSSL_TREE} wolfssl)
+        target_link_libraries(wolfmqtt PUBLIC wolfssl)
+        list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
+    else()
+        find_package(PkgConfig)
+        pkg_check_modules(WOLFSSL wolfssl)
+
+        if (WOLFSSL_FOUND)
+            list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
+            target_link_libraries(wolfmqtt PUBLIC ${WOLFSSL_LIBRARIES})
+            target_include_directories(wolfmqtt PUBLIC ${WOLFSSL_INCLUDE_DIRS})
+            target_link_directories(wolfmqtt PUBLIC ${WOLFSSL_LIBRARY_DIRS})
+            target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER})
+        else()
+            # For support with vcpkg
+            find_package(wolfssl CONFIG REQUIRED)
+            if (wolfssl_FOUND)
+                list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
+                target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl)
+            endif()
+        endif()
+    endif()
+
     list(APPEND WOLFMQTT_DEFINITIONS "-DENABLE_MQTT_TLS")
 endif()
 

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,13 @@
 ## Release Notes
 
+### v1.19.2 (01/31/2025)
+Release 1.19.2 has been developed according to wolfSSL's development and QA
+process (see link below) and successfully passed the quality criteria.
+https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance
+
+* Handle connection error in mqttsimple client by @embhorn in #407
+* Fix stat reset for ping response by @embhorn in #414
+
 ### v1.19.1 (11/06/2024)
 Release 1.19.1 has been developed according to wolfSSL's development and QA process (see link below) and successfully passed the quality criteria.
 https://www.wolfssl.com/about/wolfssl-software-development-process-quality-assurance

diff --git a/IDE/F767ZI-TOPPERS/user_settings.h b/IDE/F767ZI-TOPPERS/user_settings.h
@@ -1,6 +1,6 @@
 /* user_settings.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2024 wolfSSL Inc.])
-AC_INIT([wolfmqtt],[1.19.1],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
+AC_INIT([wolfmqtt],[1.19.2],[https://github.com/wolfssl/wolfMQTT/issues],[wolfmqtt],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -24,7 +24,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFMQTT_LIBRARY_VERSION=17:2:0
+WOLFMQTT_LIBRARY_VERSION=17:3:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |

diff --git a/examples/aws/awsiot.c b/examples/aws/awsiot.c
@@ -1,6 +1,6 @@
 /* awsiot.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/aws/awsiot.h b/examples/aws/awsiot.h
@@ -1,6 +1,6 @@
 /* awsiot.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/azure/azureiothub.c b/examples/azure/azureiothub.c
@@ -1,6 +1,6 @@
 /* azureiothub.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/azure/azureiothub.h b/examples/azure/azureiothub.h
@@ -1,6 +1,6 @@
 /* azureiothub.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/firmware/firmware.h b/examples/firmware/firmware.h
@@ -1,6 +1,6 @@
 /* firmware.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/firmware/fwclient.c b/examples/firmware/fwclient.c
@@ -1,6 +1,6 @@
 /* fwclient.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/firmware/fwclient.h b/examples/firmware/fwclient.h
@@ -1,6 +1,6 @@
 /* fwclient.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/firmware/fwpush.c b/examples/firmware/fwpush.c
@@ -1,6 +1,6 @@
 /* fwpush.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/firmware/fwpush.h b/examples/firmware/fwpush.h
@@ -1,6 +1,6 @@
 /* fwpush.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttclient/mqttclient.c b/examples/mqttclient/mqttclient.c
@@ -1,6 +1,6 @@
 /* mqttclient.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttclient/mqttclient.h b/examples/mqttclient/mqttclient.h
@@ -1,6 +1,6 @@
 /* mqttclient.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttexample.c b/examples/mqttexample.c
@@ -1,6 +1,6 @@
 /* mqttexample.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttexample.h b/examples/mqttexample.h
@@ -1,6 +1,6 @@
 /* mqttexample.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttnet.c b/examples/mqttnet.c
@@ -1,6 +1,6 @@
 /* mqttnet.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttnet.h b/examples/mqttnet.h
@@ -1,6 +1,6 @@
 /* mqttnet.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttport.c b/examples/mqttport.c
@@ -1,6 +1,6 @@
 /* mqttport.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttport.h b/examples/mqttport.h
@@ -1,7 +1,7 @@
 /*
  * mqttport.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttsimple/mqttsimple.c b/examples/mqttsimple/mqttsimple.c
@@ -1,6 +1,6 @@
 /* mqttsimple.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttsimple/mqttsimple.h b/examples/mqttsimple/mqttsimple.h
@@ -1,6 +1,6 @@
 /* mqttsimple
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/mqttuart.c b/examples/mqttuart.c
@@ -1,6 +1,6 @@
 /* mqttuart.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/multithread/multithread.c b/examples/multithread/multithread.c
@@ -1,6 +1,6 @@
 /* multithread.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/multithread/multithread.h b/examples/multithread/multithread.h
@@ -1,6 +1,6 @@
 /* multithread.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/nbclient/nbclient.c b/examples/nbclient/nbclient.c
@@ -1,6 +1,6 @@
 /* nbclient.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/nbclient/nbclient.h b/examples/nbclient/nbclient.h
@@ -1,6 +1,6 @@
 /* nbclient.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/pub-sub/mqtt-pub-sub.h b/examples/pub-sub/mqtt-pub-sub.h
@@ -1,6 +1,6 @@
 /* mqtt-pub-sub
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/pub-sub/mqtt-pub.c b/examples/pub-sub/mqtt-pub.c
@@ -1,6 +1,6 @@
 /* mqtt-pub.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/pub-sub/mqtt-sub.c b/examples/pub-sub/mqtt-sub.c
@@ -1,6 +1,6 @@
 /* mqtt-sub.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/sn-client/sn-client.c b/examples/sn-client/sn-client.c
@@ -1,6 +1,6 @@
 /* sn-client.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/sn-client/sn-client.h b/examples/sn-client/sn-client.h
@@ -1,6 +1,6 @@
 /* sn-client.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/sn-client/sn-client_qos-1.c b/examples/sn-client/sn-client_qos-1.c
@@ -1,6 +1,6 @@
 /* sn-client_qos-1.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/sn-client/sn-multithread.c b/examples/sn-client/sn-multithread.c
@@ -1,6 +1,6 @@
 /* sn-multithread.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/wiot/wiot.c b/examples/wiot/wiot.c
@@ -1,6 +1,6 @@
 /* wiot.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/examples/wiot/wiot.h b/examples/wiot/wiot.h
@@ -1,6 +1,6 @@
 /* wiot.h
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *

diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -1,6 +1,6 @@
 /* mqtt_client.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfMQTT.
  *