Changeset 181455 in webkit

Timestamp:

Mar 12, 2015 2:01:37 PM (9 years ago)

Author:

mitz@apple.com

Message:

Finish up <rdar://problem/20086546> [Cocoa] Add an option to treat certificate chains with SHA1-signed certificates as insecure

Added back OS X bits that I couldn’t land initially in r181317 or had to remove in r181327.

• platform/network/mac/CertificateInfoMac.mm:

(WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):

• platform/spi/cocoa/SecuritySPI.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/CertificateInfoMac.mm (modified) (1 diff)
• platform/spi/cocoa/SecuritySPI.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-12  Dan Bernstein  <mitz@apple.com>
+
+        Finish up <rdar://problem/20086546> [Cocoa] Add an option to treat certificate chains with SHA1-signed certificates as insecure
+
+        Added back OS X bits that I couldn’t land initially in r181317 or had to remove in r181327.
+
+        * platform/network/mac/CertificateInfoMac.mm:
+        (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
+        * platform/spi/cocoa/SecuritySPI.h:
+
 2015-03-12  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm

@@ -34 +34 @@
 bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
     if (!m_certificateChain)
         return false;

trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h

@@ -46 +46 @@
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
 EXTERN_C SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef certificate);
 #endif