[wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2…

….5.0 AND [wolfMQTT] update version to v1.14.0 (#25936) * wolfSSL release updates for wolfTPM v2.5.0, wolfSSL v5.4.0 and wolfMQTT v1.14.0. * Fixes for wolfSSL, wolfTPM and wolfMQTT for CMake issues.
microsoft · Jul 30, 2022 · 66045de · 66045de
1 parent 25d3e2c
commit 66045de
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 15 deletions.
diff --git a/ports/wolfmqtt/portfile.cmake b/ports/wolfmqtt/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfssl/wolfmqtt
-    REF v1.13.0
-    SHA512 2bd05471c548bacf6fc5166d9c2ee546b3ce5c4fab89ff16175de9ab7696b8b570cdd7d4377378fc0cb579447488dbf727cb938192eb3180ed007414cb949a8a
+    REF v1.14.0
+    SHA512 9449d87c543e823b3517a4605343a92207499812e75c950a2e8fb3d969333d39579dac69657e298826ba65017a8208c28934d7c6a4abbb4bf308514047273191
     HEAD_REF master
+    PATCHES
+      wolfmqtt_pr305.diff
     )
 
 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}

diff --git a/ports/wolfmqtt/vcpkg.json b/ports/wolfmqtt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wolfmqtt",
-  "version": "1.13.0",
-  "description": "MQTT library used with wolfSSL libraray for many platforms",
+  "version": "1.14.0",
+  "description": "MQTT library used with wolfSSL library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
   "supports": "!uwp",

diff --git a/ports/wolfmqtt/wolfmqtt_pr305.diff b/ports/wolfmqtt/wolfmqtt_pr305.diff
@@ -0,0 +1,55 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5f0f408..a436f51c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,6 +94,11 @@ target_compile_definitions(wolfmqtt PRIVATE
+     "BUILDING_WOLFMQTT"
+     )
+
++    # Tell mqtt_types.h we are using a ./configure like output / options.h
++target_compile_definitions(wolfmqtt PRIVATE
++    "BUILDING_CMAKE"
++    )
++
+ #TODO generate options file
+ configure_file(wolfmqtt/options.h.in wolfmqtt/options.h)
+
+diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h
+index f8e8f4d7..f7e33280 100644
+--- a/wolfmqtt/mqtt_types.h
++++ b/wolfmqtt/mqtt_types.h
+@@ -65,7 +65,8 @@
+ #endif
+
+ #ifdef ENABLE_MQTT_TLS
+-    #if !defined(WOLFSSL_USER_SETTINGS) && !defined(USE_WINDOWS_API)
++    #if !defined(WOLFSSL_USER_SETTINGS) && \
++        (!defined(USE_WINDOWS_API) || defined(BUILDING_CMAKE))
+         #include <wolfssl/options.h>
+     #endif
+     #include <wolfssl/wolfcrypt/settings.h>
+diff --git a/wolfmqtt/vs_settings.h b/wolfmqtt/vs_settings.h
+index a385c4e0..9d8231a0 100644
+--- a/wolfmqtt/vs_settings.h
++++ b/wolfmqtt/vs_settings.h
+@@ -4,8 +4,9 @@
+ #ifndef _WOLFMQTT_VS_SETTINGS_
+ #define _WOLFMQTT_VS_SETTINGS_
+
+-/* Don't include this if using autoconf cross-compile */
+-#ifndef HAVE_CONFIG_H
++/* Don't include this if using autoconf cross-compile or cmake */
++#if !defined(HAVE_CONFIG_H) && !defined(BUILDING_CMAKE)
++
+
+ /* TLS Support */
+ #undef  ENABLE_MQTT_TLS
+@@ -58,6 +59,7 @@
+ #undef  WOLFMQTT_NO_ERROR_STRINGS
+ //#define WOLFMQTT_NO_ERROR_STRINGS
+
+-#endif /* !HAVE_CONFIG_H */
++
++#endif /* !HAVE_CONFIG_H && !BUILDING_CMAKE */
+
+ #endif /* _WOLFMQTT_VS_SETTINGS_ */
diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfssl/wolfssl
-    REF v5.3.0-stable
-    SHA512 399d2b8aad58471d237d21dea68c33fde2b9a3c117c554c241d9174db02847a6c31afae2908839d18f9ada317b2388560a24c077b76014f663227061342bf045
+    REF v5.4.0-stable
+    SHA512 e43560f83f6c62d78b10c4df7db21f02386f22b893688b98d2f3432e3b3946a4e80960c7402404a8c0486c87b1dde5b7a3827f9d4d3be13f87f370dfc1179c78
     HEAD_REF master
+    PATCHES
+      wolfssl_pr5401.diff
     )
 
 vcpkg_cmake_configure(

diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wolfssl",
-  "version": "5.3.0",
-  "description": "TLS and Cryptographic libraray for many platforms",
+  "version": "5.4.0",
+  "description": "TLS and Cryptographic library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
   "supports": "!uwp",

diff --git a/ports/wolfssl/wolfssl_pr5401.diff b/ports/wolfssl/wolfssl_pr5401.diff
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f2da855cce3..467f4b79725 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2044,7 +2044,11 @@ endif()
+
+ if(NOT BUILD_SP)
+   list(APPEND HEADER_EXCLUDE
+-    "wolfssl/wolfcrypt/sp.h"
++    "wolfssl/wolfcrypt/sp.h")
++endif()
++
++if(NOT BUILD_SP_INT)
++  list(APPEND HEADER_EXCLUDE
+     "wolfssl/wolfcrypt/sp_int.h")
+ endif()
+
diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake
@@ -1,14 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wolfssl/wolftpm
-    REF v2.4.0
-    SHA512 82aa43f8773cc230d403d7e6cdbc4dc7dc8a3cb8e2f942c810a5ef0d60647d288ce82910820127ed6e67771d3900cfc55c5f9d87b722e0847bcb6a81c4e41441
+    REF v2.5.0
+    SHA512 4047671171fda4115a4e94bbd2362642752efbaf30531b1f55f6fe66e2e90bdf3b5549c6ddf4e53dce3b6f44c59e792217b2be4c5650857d28193aa5466919fc
     HEAD_REF master
+    PATCHES
+      wolftpm_pr235.diff
     )
 
 vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
       -DWOLFTPM_EXAMPLES=no
+      -DWOLFTPM_BUILD_OUT_OF_TREE=yes
     OPTIONS_DEBUG
       -DCMAKE_C_FLAGS='-DDEBUG_WOLFTPM'
     )

diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "wolftpm",
-  "version": "2.4.0",
-  "description": "TPM library used with wolfSSL libraray for many platforms",
+  "version": "2.5.0",
+  "description": "TPM library used with wolfSSL library for many platforms",
   "homepage": "https://wolfssl.com",
   "license": "GPL-2.0-or-later",
   "supports": "!uwp",

diff --git a/ports/wolftpm/wolftpm_pr235.diff b/ports/wolftpm/wolftpm_pr235.diff
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d642a06..157b000 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -194,7 +194,24 @@ endfunction()
+ add_definitions(${WOLFTPM_DEFINITIONS})
+
+ # generate options file
+-set(OPTION_FILE "wolftpm/options.h")
++message("Generating user options header...")
++if (${CMAKE_DISABLE_SOURCE_CHANGES})
++    set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "${CMAKE_DISABLE_SOURCE_CHANGES}")
++else()
++    set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "no")
++endif()
++
++set(WOLFTPM_BUILD_OUT_OF_TREE "${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT}" CACHE STRING
++    "Don't generate files in the source tree (default: ${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT})")
++set_property(CACHE WOLFTPM_BUILD_OUT_OF_TREE
++    PROPERTY STRINGS "yes;no")
++
++if (${WOLFTPM_BUILD_OUT_OF_TREE})
++   set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_BINARY_DIR})
++else()
++   set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR})
++endif()
++set(OPTION_FILE "${WOLFTPM_OUTPUT_BASE}/wolftpm/options.h")
+
+ file(REMOVE ${OPTION_FILE})
+
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7629,15 +7629,15 @@
       "port-version": 3
     },
     "wolfmqtt": {
-      "baseline": "1.13.0",
+      "baseline": "1.14.0",
       "port-version": 0
     },
     "wolfssl": {
-      "baseline": "5.3.0",
+      "baseline": "5.4.0",
       "port-version": 0
     },
     "wolftpm": {
-      "baseline": "2.4.0",
+      "baseline": "2.5.0",
       "port-version": 0
     },
     "wordnet": {

diff --git a/versions/w-/wolfmqtt.json b/versions/w-/wolfmqtt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3cc2bb0123d6f9ea038bf52190ba1c6c2154b02b",
+      "version": "1.14.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bc6b26e4254f8938dc9db7f7b5dc84958a45c877",
       "version": "1.13.0",

diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6b522a6326a126579cee52953fe42f597f301a22",
+      "version": "5.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4dee782f3dda81bc4a72959bcda6d1377a24cbaa",
       "version": "5.3.0",

diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "80998c4f2e20341ac7195103ba9581a8c8e0cd68",
+      "version": "2.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "647740c5ad277ccf2d910605595118087f3bc342",
       "version": "2.4.0",