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.0 KiB
51 lines
2.0 KiB
From 9ab37d83eb74676e09e107d109be6a7dc71c25a6 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 1f37305ce8..c380c134a4 100644
|
|
--- a/Utilities/cmcurl/lib/vtls/sectransp.c
|
|
+++ b/Utilities/cmcurl/lib/vtls/sectransp.c
|
|
@@ -88,6 +88,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_13_4 MAC_OS_X_VERSION_MAX_ALLOWED >= 101304
|
|
#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":
|
|
@@ -1091,7 +1092,7 @@ static CURLcode sectransp_connect_step1(struct Curl_cf
|
|
if(result != CURLE_OK)
|
|
return result;
|
|
|
|
-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \
|
|
+#if (CURL_BUILD_MAC_10_13_4 || CURL_BUILD_IOS_11) && \
|
|
defined(HAVE_BUILTIN_AVAILABLE)
|
|
if(connssl->alpn) {
|
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
|
@@ -2083,7 +2084,7 @@ check_handshake:
|
|
break;
|
|
}
|
|
|
|
-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \
|
|
+#if (CURL_BUILD_MAC_10_13_4 || CURL_BUILD_IOS_11) && \
|
|
defined(HAVE_BUILTIN_AVAILABLE)
|
|
if(connssl->alpn) {
|
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
|
--
|
|
2.45.0.windows.1
|
|
|
|
|