luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

schannel: guard ALPN init code to ALPN builds

Browse Source 
To avoid unnecessary init work with toolchains not supporting ALPN.

Follow-up to 7fd15b4a82 #16393
Closes #16420
This commit is contained in:
Viktor Szakats 2025-02-21 13:00:27 +01:00
parent 7fd15b4a82
commit 56db87a37c
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/vtls/schannel.c
View File

@ -73,16 +73,6 @@
#define SCH_DEV(x) do { } while(0) #define SCH_DEV(x) do { } while(0)
#endif #endif
/* ALPN requires version 8.1 of the Windows SDK, which was
shipped with Visual Studio 2013, aka _MSC_VER 1800:
https://technet.microsoft.com/en-us/library/hh831771%28v=ws.11%29.aspx
Or mingw-w64 9.0 or upper.
*/
#if (defined(__MINGW32__) && __MINGW64_VERSION_MAJOR >= 9) || \
(defined(_MSC_VER) && (_MSC_VER >= 1800) && !defined(_USING_V110_SDK71_))
# define HAS_ALPN_SCHANNEL
#endif
#ifndef BCRYPT_CHAIN_MODE_CCM #ifndef BCRYPT_CHAIN_MODE_CCM
#define BCRYPT_CHAIN_MODE_CCM L"ChainingModeCCM" #define BCRYPT_CHAIN_MODE_CCM L"ChainingModeCCM"
#endif #endif
@ -155,7 +145,16 @@
#define PKCS12_NO_PERSIST_KEY 0x00008000 #define PKCS12_NO_PERSIST_KEY 0x00008000
#endif #endif
/* ALPN requires version 8.1 of the Windows SDK, which was
shipped with Visual Studio 2013, aka _MSC_VER 1800:
https://technet.microsoft.com/en-us/library/hh831771%28v=ws.11%29.aspx
Or mingw-w64 9.0 or upper.
*/
#if (defined(__MINGW32__) && __MINGW64_VERSION_MAJOR >= 9) || \
(defined(_MSC_VER) && (_MSC_VER >= 1800) && !defined(_USING_V110_SDK71_))
#define HAS_ALPN_SCHANNEL
static bool s_win_has_alpn; static bool s_win_has_alpn;
#endif
static CURLcode schannel_pkp_pin_peer_pubkey(struct Curl_cfilter *cf, static CURLcode schannel_pkp_pin_peer_pubkey(struct Curl_cfilter *cf,
struct Curl_easy *data, struct Curl_easy *data,
@ -2374,6 +2373,7 @@ static void schannel_close(struct Curl_cfilter *cf, struct Curl_easy *data)
static int schannel_init(void) static int schannel_init(void)
{ {
#ifdef HAS_ALPN_SCHANNEL
bool wine = FALSE; bool wine = FALSE;
bool wine_has_alpn = FALSE; bool wine_has_alpn = FALSE;
@ -2399,6 +2399,7 @@ static int schannel_init(void)
s_win_has_alpn = curlx_verify_windows_version(6, 3, 0, PLATFORM_WINNT, s_win_has_alpn = curlx_verify_windows_version(6, 3, 0, PLATFORM_WINNT,
VERSION_GREATER_THAN_EQUAL); VERSION_GREATER_THAN_EQUAL);
} }
#endif /* HAS_ALPN_SCHANNEL */
return Curl_sspi_global_init() == CURLE_OK ? 1 : 0; return Curl_sspi_global_init() == CURLE_OK ? 1 : 0;
} }