Changeset 159692 in webkit

Timestamp:

Nov 22, 2013 9:27:59 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[curl] Fix of SSL certificate chain storage
​https://bugs.webkit.org/show_bug.cgi?id=124768

Patch by Robert Sipka <​sipka@inf.u-szeged.hu> on 2013-11-22
Reviewed by Brent Fulgham.

Change the certificates storage type into ListHashSet
from HashSet to keep the chain order in each case.
This ensures that there is no difference between the stored
and the recieved certificate chain.

• platform/network/curl/SSLHandle.cpp:

(WebCore::allowsAnyHTTPSCertificateHosts):
(WebCore::sslIgnoreHTTPSCertificate):
(WebCore::pemData):
(WebCore::certVerifyCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/SSLHandle.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-22  Robert Sipka  <sipka@inf.u-szeged.hu>
+
+        [curl] Fix of SSL certificate chain storage
+        https://bugs.webkit.org/show_bug.cgi?id=124768
+
+        Reviewed by Brent Fulgham.
+
+        Change the certificates storage type into ListHashSet
+        from HashSet to keep the chain order in each case.
+        This ensures that there is no difference between the stored
+        and the recieved certificate chain.
+
+        * platform/network/curl/SSLHandle.cpp:
+        (WebCore::allowsAnyHTTPSCertificateHosts):
+        (WebCore::sslIgnoreHTTPSCertificate):
+        (WebCore::pemData):
+        (WebCore::certVerifyCallback):
+
 2013-11-22  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/platform/network/curl/SSLHandle.cpp

@@ -33 +33 @@
 #include <openssl/ssl.h>
 #include <openssl/x509_vfy.h>
-#include <wtf/HashSet.h>
+#include <wtf/ListHashSet.h>
 
 namespace WebCore {
 
-static HashMap<String, HashSet<String>> allowedHosts;
+static HashMap<String, ListHashSet<String>> allowedHosts;
 
 void allowsAnyHTTPSCertificateHosts(const String& host)
 {
-    HashSet<String> certificates;
+    ListHashSet<String> certificates;
     allowedHosts.set(host, certificates);
 }
 
-bool sslIgnoreHTTPSCertificate(const String& host, const HashSet<String>& certificates)
-{
-    HashMap<String, HashSet<String>>::iterator it = allowedHosts.find(host);
+bool sslIgnoreHTTPSCertificate(const String& host, const ListHashSet<String>& certificates)
+{
+    HashMap<String, ListHashSet<String>>::iterator it = allowedHosts.find(host);
     if (it != allowedHosts.end()) {
         if ((it->value).isEmpty()) {
@@ -55 +55 @@
         if (certificates.size() != it->value.size())
             return false;
-        HashSet<String>::const_iterator certsIter = certificates.begin();
-        HashSet<String>::iterator valueIter = (it->value).begin();
+        ListHashSet<String>::const_iterator certsIter = certificates.begin();
+        ListHashSet<String>::iterator valueIter = (it->value).begin();
         for (; valueIter != (it->value).end(); ++valueIter, ++certsIter) {
             if (*certsIter != *valueIter)
@@ -125 +125 @@
 #if !PLATFORM(WIN)
 // success of certificates extraction
-bool pemData(X509_STORE_CTX* ctx, HashSet<String>& certificates)
+bool pemData(X509_STORE_CTX* ctx, ListHashSet<String>& certificates)
 {
     bool ok = true;
@@ -174 +174 @@
 
 #if PLATFORM(WIN)
-    HashMap<String, HashSet<String>>::iterator it = allowedHosts.find(host);
+    HashMap<String, ListHashSet<String>>::iterator it = allowedHosts.find(host);
     ok = (it != allowedHosts.end());
 #else
-    HashSet<String> certificates;
+    ListHashSet<String> certificates;
     if (!pemData(ctx, certificates))
         return 0;