Browse Source

Fixing CA verification to only happen on non-Windows and non-Apple platforms (Platforms that use OpenSSL for TLS).

Jay Sistar 10 years ago
parent
commit
92723fd3ba
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Source/Atomic/Web/WebRequest.cpp
  2. 1 1
      Source/ToolCore/Net/CurlManager.cpp

+ 1 - 1
Source/Atomic/Web/WebRequest.cpp

@@ -307,7 +307,7 @@ void WebRequest::setup(asio::io_service *service, CURLM *curlm)
     curl_easy_setopt(is_->curl, CURLOPT_ERRORBUFFER, is_->error);
     curl_easy_setopt(is_->curl, CURLOPT_ERRORBUFFER, is_->error);
     is_->error[0] = '\0';
     is_->error[0] = '\0';
 
 
-#if !(defined WIN32 || APPLE)
+#if !(defined WIN32 || defined APPLE)
     // This line will eventually go away with a CA bundle in place, or other TLS options.
     // This line will eventually go away with a CA bundle in place, or other TLS options.
     curl_easy_setopt(is_->curl, CURLOPT_SSL_VERIFYPEER, 0L);
     curl_easy_setopt(is_->curl, CURLOPT_SSL_VERIFYPEER, 0L);
 #endif
 #endif

+ 1 - 1
Source/ToolCore/Net/CurlManager.cpp

@@ -22,7 +22,7 @@ CurlRequest::CurlRequest(Context* context, const String& url, const String& post
     url_ = url;
     url_ = url;
     postData_ = postData;
     postData_ = postData;
 
 
-#if !(defined WIN32 || APPLE)
+#if !(defined WIN32 || defined APPLE)
     // This line will eventually go away with a CA bundle in place, or other TLS options.
     // This line will eventually go away with a CA bundle in place, or other TLS options.
     curl_easy_setopt(curl_, CURLOPT_SSL_VERIFYPEER, 0L);
     curl_easy_setopt(curl_, CURLOPT_SSL_VERIFYPEER, 0L);
 #endif
 #endif