diff options
Diffstat (limited to 'Source/cmCurl.cxx')
| -rw-r--r-- | Source/cmCurl.cxx | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index c135f27..5bc4f91 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -15,55 +15,48 @@ // curl versions before 7.21.5 did not provide this error code #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 -# define CURLE_NOT_BUILT_IN 4 +#define CURLE_NOT_BUILT_IN 4 #endif -#define check_curl_result(result, errstr) \ - if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) \ - { \ - e += e.empty()? "" : "\n"; \ - e += errstr; \ - e += ::curl_easy_strerror(result); \ - } +#define check_curl_result(result, errstr) \ + if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) { \ + e += e.empty() ? "" : "\n"; \ + e += errstr; \ + e += ::curl_easy_strerror(result); \ + } -std::string cmCurlSetCAInfo(::CURL *curl, const char* cafile) +std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile) { std::string e; - if(cafile && *cafile) - { + if (cafile && *cafile) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); - } -#if !defined(CMAKE_USE_SYSTEM_CURL) && \ - !defined(_WIN32) && !defined(__APPLE__) && \ - !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) -# define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" - else if(cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) - { + } +#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ + !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) +#define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" + else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, CMAKE_CAFILE_FEDORA); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); - } -# undef CMAKE_CAFILE_FEDORA - else - { -# define CMAKE_CAFILE_COMMON "/etc/ssl/certs/ca-certificates.crt" - if(cmSystemTools::FileExists(CMAKE_CAFILE_COMMON, true)) - { + } +#undef CMAKE_CAFILE_FEDORA + else { +#define CMAKE_CAFILE_COMMON "/etc/ssl/certs/ca-certificates.crt" + if (cmSystemTools::FileExists(CMAKE_CAFILE_COMMON, true)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, CMAKE_CAFILE_COMMON); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); - } -# undef CMAKE_CAFILE_COMMON -# define CMAKE_CAPATH_COMMON "/etc/ssl/certs" - if(cmSystemTools::FileIsDirectory(CMAKE_CAPATH_COMMON)) - { + } +#undef CMAKE_CAFILE_COMMON +#define CMAKE_CAPATH_COMMON "/etc/ssl/certs" + if (cmSystemTools::FileIsDirectory(CMAKE_CAPATH_COMMON)) { ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, CMAKE_CAPATH_COMMON); check_curl_result(res, "Unable to set TLS/SSL Verify CAPATH: "); - } -# undef CMAKE_CAPATH_COMMON } +#undef CMAKE_CAPATH_COMMON + } #endif return e; } |