From 6e31ee33cc9fc93599c4ceb38e229098cf339bb7 Mon Sep 17 00:00:00 2001
From: ycdev1 <153457331+ycdev1@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:31:12 +0300
Subject: [PATCH] [wolfssl] Build wolfssl with HAVE_EX_DATA and NO_WOLFSSL_STUB
 to enable async use and coexistence with openssl without link error (#38994)

Async applications using wolfssl need to associate extra data
(application context) with the ssl session and context. This is used in
verification callback.
NO_WOLFSSL_STUB is needed to prevent a link time error resulting from
duplicate symbols when linking to both wolfssl and openssl at the same
time

---------

Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Monica <liuyumei01@beyondsoft.com>
---
 ports/wolfssl/portfile.cmake | 2 +-
 ports/wolfssl/vcpkg.json     | 1 +
 versions/baseline.json       | 2 +-
 versions/w-/wolfssl.json     | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake
index 59c25432eb..f6248671f9 100644
--- a/ports/wolfssl/portfile.cmake
+++ b/ports/wolfssl/portfile.cmake
@@ -17,7 +17,7 @@ vcpkg_cmake_get_vars(cmake_vars_file)
 include("${cmake_vars_file}")
 
 foreach(config RELEASE DEBUG)
-  string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DWOLFSSL_ALT_CERT_CHAINS -DWOLFSSL_DES_ECB -DWOLFSSL_CUSTOM_OID -DHAVE_OID_ENCODING -DWOLFSSL_CERT_GEN -DWOLFSSL_ASN_TEMPLATE -DWOLFSSL_KEY_GEN -DHAVE_PKCS7 -DHAVE_AES_KEYWRAP -DWOLFSSL_AES_DIRECT -DHAVE_X963_KDF")
+  string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DHAVE_EX_DATA -DNO_WOLFSSL_STUB -DWOLFSSL_ALT_CERT_CHAINS -DWOLFSSL_DES_ECB -DWOLFSSL_CUSTOM_OID -DHAVE_OID_ENCODING -DWOLFSSL_CERT_GEN -DWOLFSSL_ASN_TEMPLATE -DWOLFSSL_KEY_GEN -DHAVE_PKCS7 -DHAVE_AES_KEYWRAP -DWOLFSSL_AES_DIRECT -DHAVE_X963_KDF")
   if ("secret-callback" IN_LIST FEATURES)
       string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DHAVE_SECRET_CALLBACK")
   endif()
diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json
index 1987efb5bb..a6c29aa360 100644
--- a/ports/wolfssl/vcpkg.json
+++ b/ports/wolfssl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wolfssl",
   "version": "5.7.0",
+  "port-version": 1,
   "description": "TLS and Cryptographic 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 a5f80c737e..7a5a383287 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9386,7 +9386,7 @@
     },
     "wolfssl": {
       "baseline": "5.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "wolftpm": {
       "baseline": "3.2.0",
diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json
index 0f8f2d57b6..34cdc4d58c 100644
--- a/versions/w-/wolfssl.json
+++ b/versions/w-/wolfssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "60802b6ec5e1284242e1b501a1eed34033bbdc35",
+      "version": "5.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "45cca8d8dd8cf4b0310f1c4bbb84c9332cdba032",
       "version": "5.7.0",