Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wolfssl] Build wolfssl with HAVE_EX_DATA and NO_WOLFSSL_STUB to enable async use and coexistence with openssl without link error #38994

Merged
merged 4 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/wolfssl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
ycdev1 marked this conversation as resolved.
Show resolved Hide resolved
if ("secret-callback" IN_LIST FEATURES)
string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DHAVE_SECRET_CALLBACK")
endif()
Expand Down
1 change: 1 addition & 0 deletions ports/wolfssl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9378,7 +9378,7 @@
},
"wolfssl": {
"baseline": "5.7.0",
"port-version": 0
"port-version": 1
},
"wolftpm": {
"baseline": "2.7.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wolfssl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4c06acb4358f2d96b464a6ea1466e4b27d42bbda",
"version": "5.7.0",
"port-version": 1
},
{
"git-tree": "45cca8d8dd8cf4b0310f1c4bbb84c9332cdba032",
"version": "5.7.0",
Expand Down
Loading