<!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>[175374] trunk/Source/WebKit2</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/175374">175374</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-10-30 11:48:43 -0700 (Thu, 30 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When a client certificate is rejected, Safari says the website didn’t accept the certificate “unknown” instead of naming the certificate
https://bugs.webkit.org/show_bug.cgi?id=138216
Reviewed by Alexey Proskuryakov.
* Shared/cf/ArgumentCodersCF.cpp:
(IPC::typeFromCFTypeRef): Remove no-longer-necessary platform guards around SecIdentityRef.
(IPC::encode): Ditto.
(IPC::decode): Ditto.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<ResourceError>::encodePlatformData): If NSErrorClientCertificateChainKey
is present in the error’s userInfo dictionary, assert that it’s an array of identities and
certificates, and include it in the filtered dictionary.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedcfArgumentCodersCFcpp">trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175373 => 175374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-30 17:39:52 UTC (rev 175373)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-30 18:48:43 UTC (rev 175374)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-30 Dan Bernstein <mitz@apple.com>
+
+ When a client certificate is rejected, Safari says the website didn’t accept the certificate “unknown” instead of naming the certificate
+ https://bugs.webkit.org/show_bug.cgi?id=138216
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (IPC::typeFromCFTypeRef): Remove no-longer-necessary platform guards around SecIdentityRef.
+ (IPC::encode): Ditto.
+ (IPC::decode): Ditto.
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<ResourceError>::encodePlatformData): If NSErrorClientCertificateChainKey
+ is present in the error’s userInfo dictionary, assert that it’s an array of identities and
+ certificates, and include it in the filtered dictionary.
+
</ins><span class="cx"> 2014-10-29 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Use modern for-loops
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfArgumentCodersCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (175373 => 175374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-10-30 17:39:52 UTC (rev 175373)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-10-30 18:48:43 UTC (rev 175374)
</span><span class="lines">@@ -80,9 +80,7 @@
</span><span class="cx"> CFString,
</span><span class="cx"> CFURL,
</span><span class="cx"> SecCertificate,
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> SecIdentity,
</span><del>-#endif
</del><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> SecKeychainItem,
</span><span class="cx"> #endif
</span><span class="lines">@@ -121,10 +119,8 @@
</span><span class="cx"> return CFURL;
</span><span class="cx"> if (typeID == SecCertificateGetTypeID())
</span><span class="cx"> return SecCertificate;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> if (typeID == SecIdentityGetTypeID())
</span><span class="cx"> return SecIdentity;
</span><del>-#endif
</del><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> if (typeID == SecKeychainItemGetTypeID())
</span><span class="cx"> return SecKeychainItem;
</span><span class="lines">@@ -173,11 +169,9 @@
</span><span class="cx"> case SecCertificate:
</span><span class="cx"> encode(encoder, (SecCertificateRef)typeRef);
</span><span class="cx"> return;
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case SecIdentity:
</span><span class="cx"> encode(encoder, (SecIdentityRef)(typeRef));
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> case SecKeychainItem:
</span><span class="cx"> encode(encoder, (SecKeychainItemRef)typeRef);
</span><span class="lines">@@ -270,7 +264,6 @@
</span><span class="cx"> result = adoptCF(certificate.leakRef());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> case SecIdentity: {
</span><span class="cx"> RetainPtr<SecIdentityRef> identity;
</span><span class="cx"> if (!decode(decoder, identity))
</span><span class="lines">@@ -278,7 +271,6 @@
</span><span class="cx"> result = adoptCF(identity.leakRef());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> case SecKeychainItem: {
</span><span class="cx"> RetainPtr<SecKeychainItemRef> keychainItem;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (175373 => 175374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-10-30 17:39:52 UTC (rev 175373)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-10-30 18:48:43 UTC (rev 175374)
</span><span class="lines">@@ -198,6 +198,19 @@
</span><span class="cx"> CFDictionarySetValue(filteredUserInfo.get(), key, value);
</span><span class="cx"> }];
</span><span class="cx">
</span><ins>+ if (NSArray *clientIdentityAndCertificates = [userInfo objectForKey:@"NSErrorClientCertificateChainKey"]) {
+ ASSERT([clientIdentityAndCertificates isKindOfClass:[NSArray class]]);
+ ASSERT(^{
+ for (id object in clientIdentityAndCertificates) {
+ if (CFGetTypeID(object) != SecIdentityGetTypeID() && CFGetTypeID(object) != SecCertificateGetTypeID())
+ return false;
+ }
+ return true;
+ }());
+
+ CFDictionarySetValue(filteredUserInfo.get(), @"NSErrorClientCertificateChainKey", clientIdentityAndCertificates);
+ };
+
</ins><span class="cx"> IPC::encode(encoder, filteredUserInfo.get());
</span><span class="cx">
</span><span class="cx"> id peerCertificateChain = [userInfo objectForKey:@"NSErrorPeerCertificateChainKey"];
</span></span></pre>
</div>
</div>
</body>
</html>