diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-10 14:58:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-10 14:58:34 (GMT) |
| commit | e1a45974d628882c38a20ed32468e17423bd715e (patch) | |
| tree | 16963f09b7af8f231f5e35ba2a769c903fcea4ca /Utilities | |
| parent | cb35d9da83194ace9f805e06c77484041947e05b (diff) | |
| parent | c0a4536cecc2e8574399f0d1d87ad74e92f0be15 (diff) | |
| download | CMake-e1a45974d628882c38a20ed32468e17423bd715e.zip CMake-e1a45974d628882c38a20ed32468e17423bd715e.tar.gz CMake-e1a45974d628882c38a20ed32468e17423bd715e.tar.bz2 | |
Merge topic 'curl-windows-no-tls1.3'
c0a4536cec curl: Disable schannel TLS 1.3 support on Windows 11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7894
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/lib/vtls/schannel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Utilities/cmcurl/lib/vtls/schannel.c b/Utilities/cmcurl/lib/vtls/schannel.c index 454eb79..e022a2c 100644 --- a/Utilities/cmcurl/lib/vtls/schannel.c +++ b/Utilities/cmcurl/lib/vtls/schannel.c @@ -220,6 +220,7 @@ set_ssl_version_min_max(DWORD *enabled_protocols, struct Curl_easy *data, 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. @@ -229,6 +230,7 @@ set_ssl_version_min_max(DWORD *enabled_protocols, struct Curl_easy *data, ssl_version_max = CURL_SSLVERSION_MAX_TLSv1_3; } else /* Windows 10 and older */ +#endif ssl_version_max = CURL_SSLVERSION_MAX_TLSv1_2; break; @@ -247,6 +249,7 @@ set_ssl_version_min_max(DWORD *enabled_protocols, struct Curl_easy *data, 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)) { @@ -257,6 +260,10 @@ set_ssl_version_min_max(DWORD *enabled_protocols, struct Curl_easy *data, 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; |