From ba8c6632194256a6a3370713d8e0423ad516361a Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 12 Dec 2014 13:29:54 -0500 Subject: [PATCH] curl: Use Windows SSL/TLS native implementation On Windows, when CMAKE_USE_OPENSSL is OFF, use the OS implementation. This will allow the OS-configured CA list to be trusted automatically. --- Help/release/dev/curl-winssl.rst | 9 +++++++++ Utilities/cmcurl/CMakeLists.txt | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/curl-winssl.rst diff --git a/Help/release/dev/curl-winssl.rst b/Help/release/dev/curl-winssl.rst new file mode 100644 index 000000000..9a28f4fca --- /dev/null +++ b/Help/release/dev/curl-winssl.rst @@ -0,0 +1,9 @@ +curl-winssl +----------- + +* On Windows, commands supporting network communication, such as + :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and + :command:`ctest_submit`, now support SSL/TLS even when CMake + is not built against OpenSSL. The Windows native SSL/TLS + implementation is used by default. OS-configured certificate + authorities will be trusted automatically. diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index eaf276ba9..1092e48c2 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -460,7 +460,11 @@ if(CMAKE_USE_OPENSSL) add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}") endif() endif(OPENSSL_FOUND) -endif(CMAKE_USE_OPENSSL) +elseif(WIN32) + # Use Windows SSL/TLS native implementation. + add_definitions(-DUSE_SCHANNEL) + set(USE_WINDOWS_SSPI 1) +endif() #libSSH2 option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON)