diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-08 19:53:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-08 19:55:24 (GMT) |
| commit | 8675d8bdb0e73be8d8f5259cefff6fe4ac95e264 (patch) | |
| tree | c502f76f99eea8f0bf8615930d77746aa9bb64c1 /Utilities | |
| parent | fc4e31d7034153cb9d72f3d812ad0c5459580dd3 (diff) | |
| download | CMake-8675d8bdb0e73be8d8f5259cefff6fe4ac95e264.zip CMake-8675d8bdb0e73be8d8f5259cefff6fe4ac95e264.tar.gz CMake-8675d8bdb0e73be8d8f5259cefff6fe4ac95e264.tar.bz2 | |
curl: Enable schannel TLS 1.3 support on Windows 11
Revert commit c0a4536cec (curl: Disable schannel TLS 1.3 support on
Windows 11, 2022-11-09, v3.25.0~13^2). The curl bug it avoided was
fixed by upstream curl commit `4f42150d0` (sendf: change Curl_read_plain
to wrap Curl_recv_plain , 2022-11-14, curl-7_87_0~129), which we have
since recently updating to curl 7.87.0.
Issue: #24147
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/lib/vtls/schannel.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Utilities/cmcurl/lib/vtls/schannel.c b/Utilities/cmcurl/lib/vtls/schannel.c index 90a6fe6..7eab954 100644 --- a/Utilities/cmcurl/lib/vtls/schannel.c +++ b/Utilities/cmcurl/lib/vtls/schannel.c @@ -220,7 +220,6 @@ set_ssl_version_min_max(DWORD *enabled_protocols, case CURL_SSLVERSION_MAX_NONE: case CURL_SSLVERSION_MAX_DEFAULT: -#if 0 /* Disabled in CMake due to issue 24147 (curl issue 9431) */ /* Windows Server 2022 and newer (including Windows 11) support TLS 1.3 built-in. Previous builds of Windows 10 had broken TLS 1.3 implementations that could be enabled via registry. @@ -230,7 +229,6 @@ set_ssl_version_min_max(DWORD *enabled_protocols, ssl_version_max = CURL_SSLVERSION_MAX_TLSv1_3; } else /* Windows 10 and older */ -#endif ssl_version_max = CURL_SSLVERSION_MAX_TLSv1_2; break; @@ -249,7 +247,6 @@ set_ssl_version_min_max(DWORD *enabled_protocols, break; case CURL_SSLVERSION_TLSv1_3: -#if 0 /* Disabled in CMake due to issue 24147 (curl issue 9431) */ /* Windows Server 2022 and newer */ if(curlx_verify_windows_version(10, 0, 20348, PLATFORM_WINNT, VERSION_GREATER_THAN_EQUAL)) { @@ -260,10 +257,6 @@ set_ssl_version_min_max(DWORD *enabled_protocols, failf(data, "schannel: TLS 1.3 not supported on Windows prior to 11"); return CURLE_SSL_CONNECT_ERROR; } -#else - failf(data, "schannel: TLS 1.3 is not yet supported"); - return CURLE_SSL_CONNECT_ERROR; -#endif } } return CURLE_OK; |