<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200816] branches/safari-602.1.32-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200816">200816</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-12 23:37:09 -0700 (Thu, 12 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/200463">r200463</a>. rdar://problem/26260800</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchSourceWTFChangeLog">branches/safari-602.1.32-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWTFwtfPlatformh">branches/safari-602.1.32-branch/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#branchessafari602132branchSourceWTFwtfspicocoaSecuritySPIh">branches/safari-602.1.32-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreplatformnetworkcfCertificateInfoh">branches/safari-602.1.32-branch/Source/WebCore/platform/network/cf/CertificateInfo.h</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm">branches/safari-602.1.32-branch/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreplatformnetworkmacCertificateInfoMacmm">branches/safari-602.1.32-branch/Source/WebCore/platform/network/mac/CertificateInfoMac.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2ChangeLog">branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedAPIcmacWKCertificateInfoMach">branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedAPIcmacWKCertificateInfoMacmm">branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm">branches/safari-602.1.32-branch/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedcfArgumentCodersCFcpp">branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedcfArgumentCodersCFh">branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">branches/safari-602.1.32-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewh">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramePrivateh">branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WTF/ChangeLog (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WTF/ChangeLog 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WTF/ChangeLog 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2016-05-12 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r200463.
+
</ins><span class="cx"> 2016-05-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [COCOA] Disable HAVE_DTRACE at build time
</span></span></pre></div>
<a id="branchessafari602132branchSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WTF/wtf/Platform.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WTF/wtf/Platform.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WTF/wtf/Platform.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -1146,9 +1146,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
-#define HAVE_SEC_TRUST_SERIALIZATION 1
-#endif
</del><span class="cx">
</span><span class="cx"> #if !defined(WTF_DEFAULT_EVENT_LOOP)
</span><span class="cx"> #define WTF_DEFAULT_EVENT_LOOP 1
</span></span></pre></div>
<a id="branchessafari602132branchSourceWTFwtfspicocoaSecuritySPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WTF/wtf/spi/cocoa/SecuritySPI.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include <Security/SecCertificatePriv.h>
</span><span class="cx"> #include <Security/SecTask.h>
</span><del>-#include <Security/SecTrustPriv.h>
</del><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><span class="lines">@@ -58,9 +57,4 @@
</span><span class="cx"> EXTERN_C SecTaskRef SecTaskCreateFromSelf(CFAllocatorRef);
</span><span class="cx"> EXTERN_C CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef *);
</span><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
-EXTERN_C CF_RETURNS_RETAINED CFDataRef SecTrustSerialize(SecTrustRef, CFErrorRef *);
-EXTERN_C CF_RETURNS_RETAINED SecTrustRef SecTrustDeserialize(CFDataRef serializedTrust, CFErrorRef *);
-#endif
-
</del><span class="cx"> #endif // SecuritySPI_h
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2016-05-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r200463.
+
+2016-05-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Roll out r200469.
</span><span class="cx">
</span><span class="cx"> 2016-05-11 Babak Shafiei <bshafiei@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreplatformnetworkcfCertificateInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/network/cf/CertificateInfo.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/platform/network/cf/CertificateInfo.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/network/cf/CertificateInfo.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -29,59 +29,28 @@
</span><span class="cx"> #include "PlatformExportMacros.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
-#include <Security/SecTrust.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CertificateInfo {
</span><span class="cx"> public:
</span><del>- CertificateInfo() = default;
-
- enum class Type {
- None,
- CertificateChain,
-#if HAVE(SEC_TRUST_SERIALIZATION)
- Trust,
-#endif
- };
</del><ins>+ CertificateInfo() { }
+ CertificateInfo(RetainPtr<CFArrayRef> certificateChain)
+ : m_certificateChain(certificateChain)
+ { }
</ins><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- explicit CertificateInfo(RetainPtr<SecTrustRef>&& trust)
- : m_trust(WTFMove(trust))
- {
- }
-
- SecTrustRef trust() const { return m_trust.get(); }
-#endif
</del><ins>+ void setCertificateChain(CFArrayRef certificateChain) { m_certificateChain = certificateChain; }
+ CFArrayRef certificateChain() const { return m_certificateChain.get(); }
</ins><span class="cx">
</span><del>- CertificateInfo(RetainPtr<CFArrayRef>&& certificateChain)
- : m_certificateChain(WTFMove(certificateChain))
- {
- }
-
- WEBCORE_EXPORT CFArrayRef certificateChain() const;
-
- WEBCORE_EXPORT Type type() const;
</del><span class="cx"> WEBCORE_EXPORT bool containsNonRootSHA1SignedCertificate() const;
</span><span class="cx">
</span><del>- bool isEmpty() const { return type() == Type::None; }
-
-#if PLATFORM(COCOA)
- static RetainPtr<CFArrayRef> certificateChainFromSecTrust(SecTrustRef);
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void dump() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- RetainPtr<SecTrustRef> m_trust;
-#endif
- mutable RetainPtr<CFArrayRef> m_certificateChain;
</del><ins>+ RetainPtr<CFArrayRef> m_certificateChain;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -99,11 +99,12 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- return CertificateInfo(trust);
-#else
- return CertificateInfo(CertificateInfo::certificateChainFromSecTrust(trust));
-#endif
</del><ins>+ CFIndex count = SecTrustGetCertificateCount(trust);
+ auto certificateChain = CFArrayCreateMutable(0, count, &kCFTypeArrayCallBacks);
+ for (CFIndex i = 0; i < count; i++)
+ CFArrayAppendValue(certificateChain, SecTrustGetCertificateAtIndex(trust, i));
+
+ return CertificateInfo(adoptCF(certificateChain));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreplatformnetworkmacCertificateInfoMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/network/mac/CertificateInfoMac.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/network/mac/CertificateInfoMac.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -31,104 +31,35 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
-RetainPtr<CFArrayRef> CertificateInfo::certificateChainFromSecTrust(SecTrustRef trust)
-{
- auto count = SecTrustGetCertificateCount(trust);
- auto certificateChain = CFArrayCreateMutable(0, count, &kCFTypeArrayCallBacks);
- for (CFIndex i = 0; i < count; i++)
- CFArrayAppendValue(certificateChain, SecTrustGetCertificateAtIndex(trust, i));
- return adoptCF((CFArrayRef)certificateChain);
-}
-#endif
-
-CertificateInfo::Type CertificateInfo::type() const
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (m_trust)
- return Type::Trust;
-#endif
- if (m_certificateChain)
- return Type::CertificateChain;
- return Type::None;
-}
-
-CFArrayRef CertificateInfo::certificateChain() const
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (m_certificateChain)
- return m_certificateChain.get();
-
- if (m_trust)
- m_certificateChain = CertificateInfo::certificateChainFromSecTrust(m_trust.get());
-#endif
-
- return m_certificateChain.get();
-}
-
</del><span class="cx"> bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
</span><span class="cx"> {
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (m_trust) {
- // Allow only the root certificate (the last in the chain) to be SHA1.
- for (CFIndex i = 0, size = SecTrustGetCertificateCount(trust()) - 1; i < size; ++i) {
- auto certificate = SecTrustGetCertificateAtIndex(trust(), i);
- if (SecCertificateGetSignatureHashAlgorithm(certificate) == kSecSignatureHashAlgorithmSHA1)
- return true;
- }
-
- return false;
- }
-#endif
-
</del><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
</span><del>- if (m_certificateChain) {
- // Allow only the root certificate (the last in the chain) to be SHA1.
- for (CFIndex i = 0, size = CFArrayGetCount(m_certificateChain.get()) - 1; i < size; ++i) {
- auto certificate = (SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i);
- if (SecCertificateGetSignatureHashAlgorithm(certificate) == kSecSignatureHashAlgorithmSHA1)
- return true;
- }
</del><ins>+ if (!m_certificateChain)
</ins><span class="cx"> return false;
</span><ins>+
+ for (CFIndex i = 0, size = CFArrayGetCount(m_certificateChain.get()) - 1; i < size; ++i) {
+ SecCertificateRef certificate = (SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i);
+ if (SecCertificateGetSignatureHashAlgorithm(certificate) == kSecSignatureHashAlgorithmSHA1)
+ return true;
</ins><span class="cx"> }
</span><ins>+ return false;
</ins><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><del>-#endif
-
</del><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void CertificateInfo::dump() const
</span><span class="cx"> {
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (m_trust) {
- CFIndex entries = SecTrustGetCertificateCount(trust());
</del><ins>+ unsigned entries = m_certificateChain ? CFArrayGetCount(m_certificateChain.get()) : 0;
</ins><span class="cx">
</span><del>- NSLog(@"CertificateInfo SecTrust\n");
- NSLog(@" Entries: %ld\n", entries);
- for (CFIndex i = 0; i < entries; ++i) {
- RetainPtr<CFStringRef> summary = adoptCF(SecCertificateCopySubjectSummary(SecTrustGetCertificateAtIndex(trust(), i)));
- NSLog(@" %@", (NSString *)summary.get());
- }
-
- return;
</del><ins>+ NSLog(@"CertificateInfo\n");
+ NSLog(@" Entries: %d\n", entries);
+ for (unsigned i = 0; i < entries; ++i) {
+ RetainPtr<CFStringRef> summary = adoptCF(SecCertificateCopySubjectSummary((SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i)));
+ NSLog(@" %@", (NSString *)summary.get());
</ins><span class="cx"> }
</span><del>-#endif
- if (m_certificateChain) {
- CFIndex entries = CFArrayGetCount(m_certificateChain.get());
-
- NSLog(@"CertificateInfo (Certificate Chain)\n");
- NSLog(@" Entries: %ld\n", entries);
- for (CFIndex i = 0; i < entries; ++i) {
- RetainPtr<CFStringRef> summary = adoptCF(SecCertificateCopySubjectSummary((SecCertificateRef)CFArrayGetValueAtIndex(m_certificateChain.get(), i)));
- NSLog(@" %@", (NSString *)summary.get());
- }
-
- return;
- }
-
- NSLog(@"CertificateInfo (Empty)\n");
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2016-05-12 Babak Shafiei <bshafiei@apple.com>
+
+ Roll out r200463.
+
</ins><span class="cx"> 2016-05-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add injected bundle SPI for getting favicon and touch icon URLs
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedAPIcmacWKCertificateInfoMach"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WKCertificateInfoMac_h
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><del>-#include <Security/SecTrust.h>
</del><span class="cx"> #include <WebKit/WKBase.h>
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="lines">@@ -35,9 +34,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKCertificateInfoRef WKCertificateInfoCreateWithCertficateChain(CFArrayRef certificateChain);
</span><del>-WK_EXPORT SecTrustRef WKCertificateInfoGetServerTrust(WKCertificateInfoRef certificateInfo);
-
-// Deprecated
</del><span class="cx"> WK_EXPORT CFArrayRef WKCertificateInfoGetCertificateChain(WKCertificateInfoRef certificateInfo);
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedAPIcmacWKCertificateInfoMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/API/c/mac/WKCertificateInfoMac.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -42,12 +42,3 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(certificateInfoRef)->certificateInfo().certificateChain();
</span><span class="cx"> }
</span><del>-
-SecTrustRef WKCertificateInfoGetServerTrust(WKCertificateInfoRef certificateInfoRef)
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- return toImpl(certificateInfoRef)->certificateInfo().trust();
-#else
- return nullptr;
-#endif
-}
</del></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -36,44 +36,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static SecCertificateRef leafCertificate(const CertificateInfo& certificateInfo)
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- return SecTrustGetCertificateAtIndex(certificateInfo.trust(), 0);
-#else
- ASSERT(CFArrayGetCount(certificateInfo.certificateChain()));
- return (SecCertificateRef)CFArrayGetValueAtIndex(certificateInfo.certificateChain(), 0);
-#endif
-}
-
-static NSArray *chain(const CertificateInfo& certificateInfo)
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- CFIndex count = SecTrustGetCertificateCount(certificateInfo.trust());
- if (count < 2)
- return nil;
-
- NSMutableArray *array = [NSMutableArray array];
- for (CFIndex i = 1; i < count; ++i)
- [array addObject:(id)SecTrustGetCertificateAtIndex(certificateInfo.trust(), i)];
-
- return array;
-#else
- CFIndex chainCount = CFArrayGetCount(certificateInfo.certificateChain());
- return chainCount > 1 ? [(NSArray *)certificateInfo.certificateChain() subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
-#endif
-}
-
-
</del><span class="cx"> // FIXME: This function creates an identity from a certificate, which should not be needed. We should pass an identity over IPC (as we do on iOS).
</span><span class="cx"> bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo, ChallengeCompletionHandler completionHandler)
</span><span class="cx"> {
</span><del>- if (certificateInfo.isEmpty())
</del><ins>+ CFArrayRef chain = certificateInfo.certificateChain();
+ if (!chain)
</ins><span class="cx"> return false;
</span><ins>+
+ ASSERT(CFArrayGetCount(chain));
</ins><span class="cx">
</span><span class="cx"> // The passed-in certificate chain includes the identity certificate at index 0, and additional certificates starting at index 1.
</span><span class="cx"> SecIdentityRef identity;
</span><del>- OSStatus result = SecIdentityCreateWithCertificate(NULL, leafCertificate(certificateInfo), &identity);
</del><ins>+ OSStatus result = SecIdentityCreateWithCertificate(NULL, (SecCertificateRef)CFArrayGetValueAtIndex(chain, 0), &identity);
</ins><span class="cx"> if (result != errSecSuccess) {
</span><span class="cx"> LOG_ERROR("Unable to create SecIdentityRef with certificate - %i", result);
</span><span class="cx"> if (completionHandler)
</span><span class="lines">@@ -83,7 +57,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSURLCredential *credential = [NSURLCredential credentialWithIdentity:identity certificates:chain(certificateInfo) persistence:NSURLCredentialPersistenceNone];
</del><ins>+ CFIndex chainCount = CFArrayGetCount(chain);
+ NSArray *nsChain = chainCount > 1 ? [(NSArray *)chain subarrayWithRange:NSMakeRange(1, chainCount - 1)] : nil;
+
+ NSURLCredential *credential = [NSURLCredential credentialWithIdentity:identity
+ certificates:nsChain
+ persistence:NSURLCredentialPersistenceNone];
+
</ins><span class="cx"> if (completionHandler)
</span><span class="cx"> completionHandler(AuthenticationChallengeDisposition::UseCredential, Credential(credential));
</span><span class="cx"> else
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedcfArgumentCodersCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include <WebCore/CFURLExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/spi/cocoa/SecuritySPI.h>
</del><span class="cx">
</span><span class="cx"> #if USE(FOUNDATION)
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="lines">@@ -88,9 +87,6 @@
</span><span class="cx"> #if HAVE(SEC_ACCESS_CONTROL)
</span><span class="cx"> SecAccessControl,
</span><span class="cx"> #endif
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- SecTrust,
-#endif
</del><span class="cx"> Null,
</span><span class="cx"> Unknown,
</span><span class="cx"> };
</span><span class="lines">@@ -133,10 +129,6 @@
</span><span class="cx"> if (typeID == SecAccessControlGetTypeID())
</span><span class="cx"> return SecAccessControl;
</span><span class="cx"> #endif
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (typeID == SecTrustGetTypeID())
- return SecTrust;
-#endif
</del><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return Unknown;
</span><span class="lines">@@ -190,11 +182,6 @@
</span><span class="cx"> encode(encoder, (SecAccessControlRef)typeRef);
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- case SecTrust:
- encode(encoder, (SecTrustRef)typeRef);
- return;
-#endif
</del><span class="cx"> case Null:
</span><span class="cx"> return;
</span><span class="cx"> case Unknown:
</span><span class="lines">@@ -302,15 +289,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- case SecTrust: {
- RetainPtr<SecTrustRef> trust;
- if (!decode(decoder, trust))
- return false;
- result = adoptCF(trust.leakRef());
- return true;
- }
-#endif
</del><span class="cx"> case Null:
</span><span class="cx"> result = tokenNullTypeRef();
</span><span class="cx"> return true;
</span><span class="lines">@@ -763,41 +741,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
-void encode(ArgumentEncoder& encoder, SecTrustRef trust)
-{
- auto data = adoptCF(SecTrustSerialize(trust, nullptr));
- if (!data) {
- encoder << false;
- return;
- }
-
- encoder << true;
- IPC::encode(encoder, data.get());
-}
-
-bool decode(ArgumentDecoder& decoder, RetainPtr<SecTrustRef>& result)
-{
- bool hasTrust;
- if (!decoder.decode(hasTrust))
- return false;
-
- if (!hasTrust)
- return true;
-
- RetainPtr<CFDataRef> trustData;
- if (!IPC::decode(decoder, trustData))
- return false;
-
- auto trust = adoptCF(SecTrustDeserialize(trustData.get(), nullptr));
- if (!trust)
- return false;
-
- result = WTFMove(trust);
- return true;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedcfArgumentCodersCFh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define ArgumentCodersCF_h
</span><span class="cx">
</span><span class="cx"> #include <Security/SecCertificate.h>
</span><del>-#include <Security/SecTrust.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="lines">@@ -95,12 +94,6 @@
</span><span class="cx"> bool decode(ArgumentDecoder&, RetainPtr<SecAccessControlRef>& result);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
-// SecTrustRef
-void encode(ArgumentEncoder&, SecTrustRef);
-bool decode(ArgumentDecoder&, RetainPtr<SecTrustRef>&);
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void setAllowsDecodingSecKeyRef(bool);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -163,53 +163,31 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<CertificateInfo>::encode(ArgumentEncoder& encoder, const CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><del>- encoder.encodeEnum(certificateInfo.type());
-
- switch (certificateInfo.type()) {
-#if HAVE(SEC_TRUST_SERIALIZATION)
- case CertificateInfo::Type::Trust:
- IPC::encode(encoder, certificateInfo.trust());
- break;
-#endif
- case CertificateInfo::Type::CertificateChain:
- IPC::encode(encoder, certificateInfo.certificateChain());
- break;
- case CertificateInfo::Type::None:
- // Do nothing.
- break;
</del><ins>+ CFArrayRef certificateChain = certificateInfo.certificateChain();
+ if (!certificateChain) {
+ encoder << false;
+ return;
</ins><span class="cx"> }
</span><ins>+
+ encoder << true;
+ IPC::encode(encoder, certificateChain);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<CertificateInfo>::decode(ArgumentDecoder& decoder, CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><del>- CertificateInfo::Type certificateInfoType;
- if (!decoder.decodeEnum(certificateInfoType))
</del><ins>+ bool hasCertificateChain;
+ if (!decoder.decode(hasCertificateChain))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- switch (certificateInfoType) {
-#if HAVE(SEC_TRUST_SERIALIZATION)
- case CertificateInfo::Type::Trust: {
- RetainPtr<SecTrustRef> trust;
- if (!IPC::decode(decoder, trust))
- return false;
-
- certificateInfo = CertificateInfo(WTFMove(trust));
</del><ins>+ if (!hasCertificateChain)
</ins><span class="cx"> return true;
</span><del>- }
-#endif
- case CertificateInfo::Type::CertificateChain: {
- RetainPtr<CFArrayRef> certificateChain;
- if (!IPC::decode(decoder, certificateChain))
- return false;
</del><span class="cx">
</span><del>- certificateInfo = CertificateInfo(WTFMove(certificateChain));
- return true;
- }
- case CertificateInfo::Type::None:
- // Do nothing.
- break;
- }
</del><ins>+ RetainPtr<CFArrayRef> certificateChain;
+ if (!IPC::decode(decoder, certificateChain))
+ return false;
</ins><span class="cx">
</span><ins>+ certificateInfo.setCertificateChain(certificateChain.get());
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,8 +219,10 @@
</span><span class="cx"> }());
</span><span class="cx">
</span><span class="cx"> CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorClientCertificateChainKey", clientIdentityAndCertificates);
</span><del>- }
</del><ins>+ };
</ins><span class="cx">
</span><ins>+ IPC::encode(encoder, filteredUserInfo.get());
+
</ins><span class="cx"> id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
</span><span class="cx"> if (!peerCertificateChain) {
</span><span class="cx"> if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey]) {
</span><span class="lines">@@ -253,16 +233,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ASSERT(!peerCertificateChain || [peerCertificateChain isKindOfClass:[NSArray class]]);
</span><del>- if (peerCertificateChain)
- CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorPeerCertificateChainKey", peerCertificateChain);
</del><ins>+ encoder << CertificateInfo((CFArrayRef)peerCertificateChain);
</ins><span class="cx">
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
- if (SecTrustRef peerTrust = (SecTrustRef)[userInfo objectForKey:NSURLErrorFailingURLPeerTrustErrorKey])
- CFDictionarySetValue(filteredUserInfo.get(), NSURLErrorFailingURLPeerTrustErrorKey, peerTrust);
-#endif
-
- IPC::encode(encoder, filteredUserInfo.get());
-
</del><span class="cx"> if (id underlyingError = [userInfo objectForKey:NSUnderlyingErrorKey]) {
</span><span class="cx"> ASSERT([underlyingError isKindOfClass:[NSError class]]);
</span><span class="cx"> encoder << true;
</span><span class="lines">@@ -297,6 +269,15 @@
</span><span class="cx"> if (!IPC::decode(decoder, userInfo))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ CertificateInfo certificate;
+ if (!decoder.decode(certificate))
+ return false;
+
+ if (certificate.certificateChain()) {
+ userInfo = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, CFDictionaryGetCount(userInfo.get()) + 1, userInfo.get()));
+ CFDictionarySetValue((CFMutableDictionaryRef)userInfo.get(), CFSTR("NSErrorPeerCertificateChainKey"), (CFArrayRef)certificate.certificateChain());
+ }
+
</ins><span class="cx"> bool hasUnderlyingError = false;
</span><span class="cx"> if (!decoder.decode(hasUnderlyingError))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -164,11 +164,12 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly) BOOL hasOnlySecureContent;
</span><span class="cx">
</span><del>-/*! @abstract A SecTrustRef for the currently committed navigation.
- @discussion @link WKWebView @/link is key-value observing (KVO) compliant
- for this property.
</del><ins>+/*! @abstract An array of SecCertificateRef objects forming the certificate
+ chain for the currently committed navigation.
+ @discussion The certificates are ordered from leaf (at index 0) to anchor.
+ @link WKWebView @/link is key-value observing (KVO) compliant for this property.
</ins><span class="cx"> */
</span><del>-@property (nonatomic, readonly, nullable) SecTrustRef serverTrust WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</del><ins>+@property (nonatomic, readonly, copy) NSArray *certificateChain WK_AVAILABLE(10_11, 9_0);
</ins><span class="cx">
</span><span class="cx"> /*! @abstract A Boolean value indicating whether there is a back item in
</span><span class="cx"> the back-forward list that can be navigated to.
</span><span class="lines">@@ -304,12 +305,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface WKWebView (WKDeprecated)
-
-@property (nonatomic, readonly, copy) NSArray *certificateChain WK_DEPRECATED(10_11, WK_MAC_TBA, 9_0, WK_IOS_TBA, "Please use serverTrust");
-
-@end
-
</del><span class="cx"> NS_ASSUME_NONNULL_END
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -724,17 +724,13 @@
</span><span class="cx"> return _page->pageLoadState().hasOnlySecureContent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (SecTrustRef)serverTrust
</del><ins>+- (NSArray *)certificateChain
</ins><span class="cx"> {
</span><del>-#if HAVE(SEC_TRUST_SERIALIZATION)
</del><span class="cx"> auto certificateInfo = _page->pageLoadState().certificateInfo();
</span><span class="cx"> if (!certificateInfo)
</span><del>- return nil;
</del><ins>+ return @[ ];
</ins><span class="cx">
</span><del>- return certificateInfo->certificateInfo().trust();
-#else
- return nil;
-#endif
</del><ins>+ return (NSArray *)certificateInfo->certificateInfo().certificateChain() ?: @[ ];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)canGoBack
</span><span class="lines">@@ -4576,19 +4572,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@implementation WKWebView (WKDeprecated)
-
-- (NSArray *)certificateChain
-{
- auto certificateInfo = _page->pageLoadState().certificateInfo();
- if (!certificateInfo)
- return @[ ];
-
- return (NSArray *)certificateInfo->certificateInfo().certificateChain() ?: @[ ];
-}
-
-@end
-
</del><span class="cx"> #if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/WKWebViewAdditions.mm>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -902,14 +902,12 @@
</span><span class="cx">
</span><span class="cx"> void NavigationState::willChangeCertificateInfo()
</span><span class="cx"> {
</span><del>- [m_webView willChangeValueForKey:@"serverTrust"];
</del><span class="cx"> [m_webView willChangeValueForKey:@"certificateChain"];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NavigationState::didChangeCertificateInfo()
</span><span class="cx"> {
</span><span class="cx"> [m_webView didChangeValueForKey:@"certificateChain"];
</span><del>- [m_webView didChangeValueForKey:@"serverTrust"];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NavigationState::willChangeWebProcessIsResponsive()
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -149,15 +149,6 @@
</span><span class="cx"> return (NSArray *)_frame->certificateInfo().certificateChain();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (SecTrustRef)_serverTrust
-{
-#if HAVE(SEC_TRUST_SERIALIZATION)
- return _frame->certificateInfo().trust();
-#else
- return nil;
-#endif
-}
-
</del><span class="cx"> - (NSURL *)_provisionalURL
</span><span class="cx"> {
</span><span class="cx"> return [NSURL _web_URLWithWTFString:_frame->provisionalURL()];
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2WebProcessInjectedBundleAPICocoaWKWebProcessPlugInFramePrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h (200815 => 200816)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h 2016-05-13 06:34:27 UTC (rev 200815)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFramePrivate.h 2016-05-13 06:37:09 UTC (rev 200816)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) BOOL _hasCustomContentProvider;
</span><span class="cx"> @property (nonatomic, readonly) NSArray *_certificateChain;
</span><del>-@property (nonatomic, readonly) SecTrustRef _serverTrust;
</del><span class="cx"> @property (nonatomic, readonly) NSURL *_provisionalURL;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) WKWebProcessPlugInFrame *_parentFrame;
</span></span></pre>
</div>
</div>
</body>
</html>