mirror of https://github.com/microsoft/vcpkg.git
[curl] Fix SSL on iOS (#26060)
* Fix SSL on iOS Enables secure transport SSL backend on iOS. When CURL_CA_BUNDLE is set (defaults to /etc/ssl/cert.pem) curl sets it as CA for every request, but on iOS this file is missing and curl's `sectransp` SSL implementation can't deal with it, failing the request completely. This change makes CURL_CA_BUNDLE to be unset, much like CURL_CA_PATH so that `sectransp` uses system CA store. * Update versions/c-/curl.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
This commit is contained in:
parent
2c844a929b
commit
a79bb7b608
|
|
@ -22,7 +22,7 @@ foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap")
|
|||
endif()
|
||||
endforeach()
|
||||
|
||||
if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
|
||||
if("sectransp" IN_LIST FEATURES AND NOT (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS))
|
||||
message(FATAL_ERROR "sectransp is not supported on non-Apple platforms")
|
||||
endif()
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ if("idn2" IN_LIST FEATURES)
|
|||
endif()
|
||||
|
||||
if("sectransp" IN_LIST FEATURES)
|
||||
list(APPEND OPTIONS -DCURL_CA_PATH=none)
|
||||
list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none)
|
||||
endif()
|
||||
|
||||
# UWP targets
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "curl",
|
||||
"version": "7.84.0",
|
||||
"port-version": 1,
|
||||
"description": "A library for transferring data with URLs",
|
||||
"homepage": "https://curl.se/",
|
||||
"license": null,
|
||||
|
|
@ -131,7 +132,7 @@
|
|||
"features": [
|
||||
"sectransp"
|
||||
],
|
||||
"platform": "osx"
|
||||
"platform": "osx | ios"
|
||||
},
|
||||
{
|
||||
"name": "curl",
|
||||
|
|
@ -147,7 +148,7 @@
|
|||
"features": [
|
||||
"openssl"
|
||||
],
|
||||
"platform": "(uwp | !windows) & !osx & !mingw"
|
||||
"platform": "(uwp | !windows) & !(osx | ios) & !mingw"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1770,7 +1770,7 @@
|
|||
},
|
||||
"curl": {
|
||||
"baseline": "7.84.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"curlpp": {
|
||||
"baseline": "2018-06-15",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4d64a4ac7f080159be045ccbf0a7fa81ef859cfa",
|
||||
"version": "7.84.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "984e0a92df662f6022989c2b5889e7d9f1c133d5",
|
||||
"version": "7.84.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue