Title: [181455] trunk/Source/WebCore
- Revision
- 181455
- Author
- [email protected]
- Date
- 2015-03-12 14:01:37 -0700 (Thu, 12 Mar 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181454 => 181455)
--- trunk/Source/WebCore/ChangeLog 2015-03-12 20:49:13 UTC (rev 181454)
+++ trunk/Source/WebCore/ChangeLog 2015-03-12 21:01:37 UTC (rev 181455)
@@ -1,3 +1,13 @@
+2015-03-12 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
REGRESSION: Crash under Heap::reportExtraMemoryAllocatedSlowCase for media element
Modified: trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm (181454 => 181455)
--- trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2015-03-12 20:49:13 UTC (rev 181454)
+++ trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2015-03-12 21:01:37 UTC (rev 181455)
@@ -33,7 +33,7 @@
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;
Modified: trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h (181454 => 181455)
--- trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-03-12 20:49:13 UTC (rev 181454)
+++ trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h 2015-03-12 21:01:37 UTC (rev 181455)
@@ -45,7 +45,7 @@
#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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
