curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-10 14:12:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

schannel: enable ALPN support under WINE 6.0+

Browse Source 
ALPN support was announced in 5.6 (2020-04-10). It likely needs a WINE
built against GnuTLS 3.2.0 (2013-05-10) or upper (for macOS, GnuTLS was
made default in WINE 6.0.2). I could confirm ALPN working under 6.0.2
(2021-10-26).

https://www.winehq.org/announce/5.6
0527cf89fb
https://gitlab.winehq.org/wine/wine/-/blob/wine-5.6/dlls/secur32/schannel_gnutls.c
https://gitlab.winehq.org/wine/wine/-/blob/wine-5.6/dlls/secur32/tests/schannel.c

If you run into problems, open and Issue and disable ALPN manually with
`--no-alpn` or the equivalent for libcurl.

Ref: #983
Closes #16393
This commit is contained in:
Viktor Szakats 2025-02-19 12:26:47 +01:00
parent 4d01de3529
commit 7fd15b4a82
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/vtls/schannel.c
View File

@ -155,6 +155,8 @@
#define PKCS12_NO_PERSIST_KEY 0x00008000 #define PKCS12_NO_PERSIST_KEY 0x00008000
#endif #endif
static bool s_win_has_alpn;
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,
const char *pinnedpubkey); const char *pinnedpubkey);
@ -905,26 +907,11 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
"connect to some servers due to lack of SNI, algorithms, etc."); "connect to some servers due to lack of SNI, algorithms, etc.");
} }
{
#ifdef HAS_ALPN_SCHANNEL #ifdef HAS_ALPN_SCHANNEL
bool wine; backend->use_alpn = connssl->alpn && s_win_has_alpn;
#ifdef CURL_WINDOWS_UWP
/* GetModuleHandle() not available for UWP.
Assume no WINE because WINE has no UWP support. */
wine = FALSE;
#else #else
wine = !!GetProcAddress(GetModuleHandle(TEXT("ntdll")), backend->use_alpn = FALSE;
"wine_get_version");
#endif #endif
/* ALPN is only supported on Windows 8.1 / Server 2012 R2 and above.
Also it does not seem to be supported for WINE, see curl bug #983. */
backend->use_alpn = connssl->alpn && !wine &&
curlx_verify_windows_version(6, 3, 0, PLATFORM_WINNT,
VERSION_GREATER_THAN_EQUAL);
#else
backend->use_alpn = FALSE;
#endif
}
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#ifdef HAS_MANUAL_VERIFY_API #ifdef HAS_MANUAL_VERIFY_API
@ -2387,6 +2374,32 @@ static void schannel_close(struct Curl_cfilter *cf, struct Curl_easy *data)
static int schannel_init(void) static int schannel_init(void)
{ {
bool wine = FALSE;
bool wine_has_alpn = FALSE;
#ifndef CURL_WINDOWS_UWP
typedef const char *(APIENTRY *WINE_GET_VERSION_FN)(void);
/* GetModuleHandle() not available for UWP.
Assume no WINE because WINE has no UWP support. */
WINE_GET_VERSION_FN p_wine_get_version =
CURLX_FUNCTION_CAST(WINE_GET_VERSION_FN,
(GetProcAddress(GetModuleHandle(TEXT("ntdll")),
"wine_get_version")));
wine = !!p_wine_get_version;
if(wine) {
const char *wine_version = p_wine_get_version(); /* e.g. "6.0.2" */
/* Assume ALPN support with WINE 6.0 or upper */
wine_has_alpn = wine_version && atoi(wine_version) >= 6;
}
#endif
if(wine)
s_win_has_alpn = wine_has_alpn;
else {
/* ALPN is supported on Windows 8.1 / Server 2012 R2 and above. */
s_win_has_alpn = curlx_verify_windows_version(6, 3, 0, PLATFORM_WINNT,
VERSION_GREATER_THAN_EQUAL);
}
return Curl_sspi_global_init() == CURLE_OK ? 1 : 0; return Curl_sspi_global_init() == CURLE_OK ? 1 : 0;
} }