[Curl] Forward declare SSL context
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Sep 2017 20:48:49 +0000 (20:48 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Sep 2017 20:48:49 +0000 (20:48 +0000)
Unreviewed build fix after r222147. OpenSSL's SHA1 declaration conflicts with WTF's.

No new tests. No change in behavior.

* platform/network/curl/CurlSSLHandle.h:
* platform/network/curl/CurlSSLVerifier.cpp:
* platform/network/curl/CurlSSLVerifier.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222177 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/curl/CurlSSLHandle.h
Source/WebCore/platform/network/curl/CurlSSLVerifier.cpp
Source/WebCore/platform/network/curl/CurlSSLVerifier.h

index 7e6c9aa..5b642d3 100644 (file)
@@ -1,3 +1,15 @@
+2017-09-18  Don Olmstead  <don.olmstead@sony.com>
+
+        [Curl] Forward declare SSL context
+
+        Unreviewed build fix after r222147. OpenSSL's SHA1 declaration conflicts with WTF's.
+
+        No new tests. No change in behavior.
+
+        * platform/network/curl/CurlSSLHandle.h:
+        * platform/network/curl/CurlSSLVerifier.cpp:
+        * platform/network/curl/CurlSSLVerifier.h:
+
 2017-09-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         getData('text/plain') doesn't work on iOS 10
index 4fe005a..3a37651 100644 (file)
@@ -30,7 +30,6 @@
 #include <winsock2.h>
 #endif
 
-#include <openssl/ssl.h>
 #include <wtf/HashMap.h>
 #include <wtf/ListHashSet.h>
 #include <wtf/Noncopyable.h>
index 4c1b221..f0a1d20 100644 (file)
@@ -30,6 +30,7 @@
 #if USE(CURL)
 #include "CurlContext.h"
 #include "CurlSSLHandle.h"
+#include <openssl/ssl.h>
 
 namespace WebCore {
 
index 8f381a4..58e2d2d 100644 (file)
 #include <winsock2.h>
 #endif
 
-#include <openssl/ssl.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/text/WTFString.h>
 
+struct x509_store_ctx_st;
+typedef struct x509_store_ctx_st X509_STORE_CTX;
+
 namespace WebCore {
 
 class CurlHandle;