diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-09 15:10:07 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-09 10:10:19 -0500 |
| commit | 288e815324108ba3e557b866308738884c70b69e (patch) | |
| tree | a109a05ec64b65584a1bc8559c1ea06712a941ed /Utilities | |
| parent | adb07423ca7c7f464f5b8d8554840714714dc298 (diff) | |
| parent | 8675d8bdb0e73be8d8f5259cefff6fe4ac95e264 (diff) | |
| download | cmake-288e815324108ba3e557b866308738884c70b69e.tar.gz | |
Merge topic 'curl-windows-restore-tls1.3'
8675d8bdb0 curl: Enable schannel TLS 1.3 support on Windows 11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8184
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 90a6fe6426..7eab9542af 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; |