You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
51 lines
2.3 KiB
51 lines
2.3 KiB
From f0d87cb7c54464a1b2677346a6f53771527ad50a Mon Sep 17 00:00:00 2001
|
|
From: Steve Lhomme <robux4@ycbcr.xyz>
|
|
Date: Thu, 11 Jun 2020 15:09:53 +0200
|
|
Subject: [PATCH] enable ALPN support on macOS 10.14
|
|
|
|
It fails to link properly with a macOS 10.13 SDK:
|
|
|
|
[ 44%] Linking C executable curltest
|
|
Undefined symbols for architecture x86_64:
|
|
"_SSLCopyALPNProtocols", referenced from:
|
|
_sectransp_connect_step2 in libcmcurl.a(sectransp.c.o)
|
|
"_SSLSetALPNProtocols", referenced from:
|
|
_sectransp_connect_common in libcmcurl.a(sectransp.c.o)
|
|
ld: symbol(s) not found for architecture x86_64
|
|
---
|
|
Utilities/cmcurl/lib/vtls/sectransp.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Utilities/cmcurl/lib/vtls/sectransp.c b/Utilities/cmcurl/lib/vtls/sectransp.c
|
|
index 2e57d83785..87fefba263 100644
|
|
--- a/Utilities/cmcurl/lib/vtls/sectransp.c
|
|
+++ b/Utilities/cmcurl/lib/vtls/sectransp.c
|
|
@@ -80,6 +80,7 @@
|
|
#define CURL_BUILD_MAC_10_9 MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
|
|
#define CURL_BUILD_MAC_10_11 MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
|
|
#define CURL_BUILD_MAC_10_13 MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
|
|
+#define CURL_BUILD_MAC_10_14 MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
|
|
#define CURL_BUILD_MAC_10_15 MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
|
|
/* These macros mean "the following code is present to allow runtime backward
|
|
compatibility with at least this cat or earlier":
|
|
@@ -1838,7 +1839,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data,
|
|
}
|
|
#endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */
|
|
|
|
-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
|
+#if (CURL_BUILD_MAC_10_14 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
|
if(conn->bits.tls_enable_alpn) {
|
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
|
CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
|
|
@@ -2832,7 +2833,7 @@ sectransp_connect_step2(struct Curl_easy *data, struct connectdata *conn,
|
|
break;
|
|
}
|
|
|
|
-#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
|
+#if(CURL_BUILD_MAC_10_14 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
|
if(conn->bits.tls_enable_alpn) {
|
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
|
CFArrayRef alpnArr = NULL;
|
|
--
|
|
2.37.0 (Apple Git-136)
|
|
|
|
|