mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-27 19:28:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'curl-windows-restore-tls1.3' into release-3.26

Browse Source 
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
This commit is contained in:
Brad King
2023-02-09 15:10:07 +00:00
committed by Kitware Robot
parent 0a95c3579b 8675d8bdb0
commit f9ccb7fada
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Utilities/cmcurl/lib/vtls/schannel.c
View File

@@ -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;