diff --git a/ports/wolfmqtt/cmake-patch.diff b/ports/wolfmqtt/cmake-patch.diff new file mode 100644 index 0000000000..47148665ea --- /dev/null +++ b/ports/wolfmqtt/cmake-patch.diff @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32f0332..4cec80c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,12 +65,12 @@ else() + target_compile_options(wolfmqtt PUBLIC ${WOLFSSL_CFLAGS_OTHER}) + else() + # For support with vcpkg +- find_package(wolfssl CONFIG) ++ find_package(wolfssl CONFIG REQUIRED) + if (wolfssl_FOUND) + target_compile_definitions(wolfmqtt PUBLIC + "ENABLE_MQTT_TLS" + ) +- target_link_libraries(wolfmqtt PUBLIC wolfssl) ++ target_link_libraries(wolfmqtt PUBLIC wolfssl::wolfssl) + endif() + endif() + endif() diff --git a/ports/wolfmqtt/portfile.cmake b/ports/wolfmqtt/portfile.cmake index 4e5c2014c4..82799c9aaa 100644 --- 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.15.0 - SHA512 9012e4723d469ce98bd5f0e6a3e001ab6c94c0fb4fef0d2de73446d702959052f6f5fe5a9d805b088f17c2d94a25abf41ae802421c99b62f8d8cd9a14c9e7271 + REF v1.16.0 + SHA512 30d28a37b26adacae589b9cfee9a2cd8697fa1e84ac867d08123dab5434bb19152adb0d94224656d2c1f01833d76bcd7ff63b63da4dbce0873b352e93b6e6b12 HEAD_REF master + PATCHES + cmake-patch.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolfmqtt/vcpkg.json b/ports/wolfmqtt/vcpkg.json index 9c914fe983..08ebd20818 100644 --- a/ports/wolfmqtt/vcpkg.json +++ b/ports/wolfmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolfmqtt", - "version": "1.15.0", + "version": "1.16.0", "description": "MQTT library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 8a5aadbc5d..fcbbc33f5e 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.5.4-stable - SHA512 6ecb37d614ae7b8ea9caa5bedebe2bb16b2719e172e146fc707ce1ead09a6c4d168b8e8aa52255d4cf0341a0617f17d7f4b321ba88aaa77664861c31ca7a1163 + REF v5.6.3-stable + SHA512 7c3b5c06ade7826031db089d50ec45c36970555499b6be94d1939b3002369fc98e503418128c6b2e253df7e92f86a71647d37f2cd27d57ac201e5aba32b879dc HEAD_REF master PATCHES - pr_5949.patch + warning-and-include.patch ) vcpkg_cmake_configure( diff --git a/ports/wolfssl/pr_5949.patch b/ports/wolfssl/pr_5949.patch deleted file mode 100644 index 958cc1b4ec..0000000000 --- a/ports/wolfssl/pr_5949.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/internal.c b/src/internal.c -index 1afa361f9d0..c17158b34cd 100644 ---- a/src/internal.c -+++ b/src/internal.c -@@ -12781,9 +12781,17 @@ static int ProcessPeerCertParse(WOLFSSL* ssl, ProcPeerCertArgs* args, - return BAD_FUNC_ARG; - } - -+PRAGMA_GCC_DIAG_PUSH -+PRAGMA_GCC("GCC diagnostic ignored \"-Wstrict-overflow\"") -+ /* Surrounded in gcc pragma to avoid -Werror=strict-overflow when the -+ * compiler optimizes out the check and assumes no underflow. Keeping the -+ * check in place to handle multiple build configurations and future -+ * changes. */ -+ - /* check to make sure certificate index is valid */ - if (args->certIdx > args->count) - return BUFFER_E; -+PRAGMA_GCC_DIAG_POP - - /* check if returning from non-blocking OCSP */ - /* skip this section because cert is already initialized and parsed */ - -diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c -index b5199ed7352..cbff871f08a 100644 ---- a/wolfcrypt/src/sp_int.c -+++ b/wolfcrypt/src/sp_int.c -@@ -4822,6 +4822,10 @@ int sp_copy(const sp_int* a, sp_int* r) - } - /* Only copy if different pointers. */ - else if (a != r) { -+ PRAGMA_GCC_DIAG_PUSH -+ PRAGMA_GCC("GCC diagnostic ignored \"-Wstrict-overflow\"") -+ /* Surrounded in gcc pragma to avoid -Werror=strict-overflow when the -+ * compiler optimizes out the check and assumes no overflow. */ - /* Validated space in result. */ - if (a->used > r->size) { - err = MP_VAL; -@@ -4841,6 +4845,7 @@ int sp_copy(const sp_int* a, sp_int* r) - r->sign = a->sign; - #endif - } -+ PRAGMA_GCC_DIAG_POP - } - - return err; diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 49efd3af8f..4c2ac10b7c 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolfssl", - "version": "5.5.4", + "version": "5.6.3", "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolfssl/warning-and-include.patch b/ports/wolfssl/warning-and-include.patch new file mode 100644 index 0000000000..e71d2f8549 --- /dev/null +++ b/ports/wolfssl/warning-and-include.patch @@ -0,0 +1,29 @@ +diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c +index 96f27928d90..51e6205cf9d 100644 +--- a/wolfcrypt/src/asn.c ++++ b/wolfcrypt/src/asn.c +@@ -30431,9 +30431,9 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid, + + ext = &cert->customCertExt[cert->customCertExtCount]; + +- ext->oid = oid; ++ ext->oid = (char*)oid; + ext->crit = (critical == 0) ? 0 : 1; +- ext->val = der; ++ ext->val = (byte*)der; + ext->valSz = derSz; + + cert->customCertExtCount++; +diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h +index 8c323840584..a7d70e01fbf 100644 +--- a/wolfssl/wolfio.h ++++ b/wolfssl/wolfio.h +@@ -26,6 +26,8 @@ + #ifndef WOLFSSL_IO_H + #define WOLFSSL_IO_H + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif diff --git a/ports/wolftpm/cmake-patch.diff b/ports/wolftpm/cmake-patch.diff new file mode 100644 index 0000000000..18bd7fcaa6 --- /dev/null +++ b/ports/wolftpm/cmake-patch.diff @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b77a9df..0c45975 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,9 +146,9 @@ else() + target_compile_options(wolftpm PUBLIC ${WOLFSSL_CFLAGS_OTHER}) + else() + # For support with vcpkg +- find_package(wolfssl CONFIG) ++ find_package(wolfssl CONFIG REQUIRED) + if (wolfssl_FOUND) +- target_link_libraries(wolftpm PUBLIC wolfssl) ++ target_link_libraries(wolftpm PUBLIC wolfssl::wolfssl) + else() + list(APPEND WOLFTPM_DEFINITIONS "-DWOLFTPM2_NO_WOLFCRYPT") + endif() diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake index 1940eaf105..0a2686fbb2 100644 --- a/ports/wolftpm/portfile.cmake +++ b/ports/wolftpm/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v2.7.0 SHA512 1b3e1bbd9f6e35226ff30cc6de7631fb420343a2ae4c8849d1477314a5fe8a95b99800fa17e10a30a9894041142748d654c913a5c4f4dc9eaad3f5157e405276 HEAD_REF master + PATCHES + cmake-patch.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json index ba1e880f97..10c7ae02d8 100644 --- a/ports/wolftpm/vcpkg.json +++ b/ports/wolftpm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wolftpm", "version": "2.7.0", - "port-version": 1, + "port-version": 2, "description": "TPM library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3a05492762..ece33605a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8705,16 +8705,16 @@ "port-version": 3 }, "wolfmqtt": { - "baseline": "1.15.0", + "baseline": "1.16.0", "port-version": 0 }, "wolfssl": { - "baseline": "5.5.4", + "baseline": "5.6.3", "port-version": 0 }, "wolftpm": { "baseline": "2.7.0", - "port-version": 1 + "port-version": 2 }, "wordnet": { "baseline": "3.0", diff --git a/versions/w-/wolfmqtt.json b/versions/w-/wolfmqtt.json index 99c46b9325..ce5d8a2dec 100644 --- a/versions/w-/wolfmqtt.json +++ b/versions/w-/wolfmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d01462c764790a2ab97815a9f16a40186b62de14", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "b17cfe13abcf334e7f4563d5c5699c4b32078e98", "version": "1.15.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index ca090fc23c..4c57d003e1 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e809eb7090657113c8f628ce22975c7f3bd3dbfd", + "version": "5.6.3", + "port-version": 0 + }, { "git-tree": "71789bbc13920d34e74d8bc23af6d5d480e7b610", "version": "5.5.4", diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json index 7a04044ae2..29c002eda1 100644 --- a/versions/w-/wolftpm.json +++ b/versions/w-/wolftpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe055978dbd963b2969e104333a2b79d49ff6cee", + "version": "2.7.0", + "port-version": 2 + }, { "git-tree": "d6849bfc65dbf33f5d51d9bc8c7a4e365a1d3553", "version": "2.7.0",