diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-22 15:15:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-23 13:57:32 (GMT) |
| commit | 0abd3e538eb92259e52c3d330e46dac7aa0be332 (patch) | |
| tree | c43acd5147b5120bbbe15522568b899ebab2a9e6 /Source/CTest | |
| parent | 6ce346c53c67ba970cd04f0d8436aab006dbec71 (diff) | |
| download | CMake-0abd3e538eb92259e52c3d330e46dac7aa0be332.zip CMake-0abd3e538eb92259e52c3d330e46dac7aa0be332.tar.gz CMake-0abd3e538eb92259e52c3d330e46dac7aa0be332.tar.bz2 | |
cmake: Use a default CA path when not using system curl
When using system curl, we trust it to be configured with desired CA
certs. When using our own build of curl, we use os-configured CA certs
on Windows and OS X. On other systems, try to achieve this by searching
for common CA cert locations. According to a brief investigation, the
curl packages on popular Linux distros are currently configured as:
* Arch: /etc/ssl/certs/ca-certificates.crt
* Debian with OpenSSL: /etc/ssl/certs
* Debian with GNU TLS: /etc/ssl/certs/ca-certificates.crt
* Debian with NSS: /etc/ssl/certs/ca-certificates.crt
* Fedora: /etc/pki/tls/certs/ca-bundle.crt
* Gentoo with OpenSSL: /etc/ssl/certs
* Gentoo without OpenSSL: /etc/ssl/certs/ca-certificates.crt
Teach CMake and CTest to look for these paths and use them as a CA path
or bundle when no other os-configured or user-specified CAs are
available.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 11e3343..3d9545f 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -26,7 +26,7 @@ #include <cm_jsoncpp_reader.h> // For curl submission -#include "cm_curl.h" +#include "cmCurl.h" #include "cmCTestCurl.h" #include <sys/stat.h> @@ -366,6 +366,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix, curl = curl_easy_init(); if(curl) { + cmCurlSetCAInfo(curl); if(verifyPeerOff) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, |