<!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>[169658] 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/169658">169658</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-06-06 13:34:26 -0700 (Fri, 06 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fix after <http://trac.webkit.org/changeset/169655>.
The SPIs used do not exist on Mac, limit the code to iOS.
* Shared/Authentication/mac/AuthenticationManager.mac.mm:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<Credential>::encode):
(IPC::ArgumentCoder<Credential>::decode):
* Shared/cf/ArgumentCodersCF.cpp:
(IPC::typeFromCFTypeRef):
(IPC::encode):
(IPC::decode):
* Shared/cf/ArgumentCodersCF.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm">trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedcfArgumentCodersCFcpp">trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedcfArgumentCodersCFh">trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169657 => 169658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-06 20:07:29 UTC (rev 169657)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-06 20:34:26 UTC (rev 169658)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-06 Alexey Proskuryakov <ap@apple.com>
+
+ Build fix after <http://trac.webkit.org/changeset/169655>.
+
+ The SPIs used do not exist on Mac, limit the code to iOS.
+
+ * Shared/Authentication/mac/AuthenticationManager.mac.mm:
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<Credential>::encode):
+ (IPC::ArgumentCoder<Credential>::decode):
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (IPC::typeFromCFTypeRef):
+ (IPC::encode):
+ (IPC::decode):
+ * Shared/cf/ArgumentCodersCF.h:
+
</ins><span class="cx"> 2014-06-06 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/17095692> [iOS] Client-certificate authentication isn’t working
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm (169657 => 169658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2014-06-06 20:07:29 UTC (rev 169657)
+++ trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2014-06-06 20:34:26 UTC (rev 169658)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+// 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).
</ins><span class="cx"> bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><span class="cx"> CFArrayRef chain = certificateInfo.certificateChain();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (169657 => 169658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-06 20:07:29 UTC (rev 169657)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-06 20:34:26 UTC (rev 169658)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<Credential>::encode(ArgumentEncoder& encoder, const Credential& credential)
</span><span class="cx"> {
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
</del><ins>+#if CERTIFICATE_CREDENTIALS_SUPPORTED && PLATFORM(IOS)
</ins><span class="cx"> encoder.encodeEnum(credential.type());
</span><span class="cx">
</span><span class="cx"> if (credential.type() == CredentialTypeClientCertificate) {
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<Credential>::decode(ArgumentDecoder& decoder, Credential& credential)
</span><span class="cx"> {
</span><del>-#if CERTIFICATE_CREDENTIALS_SUPPORTED
</del><ins>+#if CERTIFICATE_CREDENTIALS_SUPPORTED && PLATFORM(IOS)
</ins><span class="cx"> CredentialType type;
</span><span class="cx">
</span><span class="cx"> if (!decoder.decodeEnum(type))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfArgumentCodersCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (169657 => 169658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-06-06 20:07:29 UTC (rev 169657)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2014-06-06 20:34:26 UTC (rev 169658)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #if defined(__has_include) && __has_include(<Security/SecIdentityPriv.h>)
</span><span class="cx"> #include <Security/SecIdentityPriv.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -48,6 +49,7 @@
</span><span class="cx">
</span><span class="cx"> extern "C" OSStatus SecKeyCopyPersistentRef(SecKeyRef key, CFDataRef* persistentRef);
</span><span class="cx"> extern "C" OSStatus SecKeyFindWithPersistentRef(CFDataRef persistentRef, SecKeyRef* lookedUpData);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -70,7 +72,9 @@
</span><span class="cx"> CFString,
</span><span class="cx"> CFURL,
</span><span class="cx"> SecCertificate,
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> SecIdentity,
</span><ins>+#endif
</ins><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> SecKeychainItem,
</span><span class="cx"> #endif
</span><span class="lines">@@ -106,8 +110,10 @@
</span><span class="cx"> return CFURL;
</span><span class="cx"> if (typeID == SecCertificateGetTypeID())
</span><span class="cx"> return SecCertificate;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> if (typeID == SecIdentityGetTypeID())
</span><span class="cx"> return SecIdentity;
</span><ins>+#endif
</ins><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> if (typeID == SecKeychainItemGetTypeID())
</span><span class="cx"> return SecKeychainItem;
</span><span class="lines">@@ -152,9 +158,11 @@
</span><span class="cx"> case SecCertificate:
</span><span class="cx"> encode(encoder, (SecCertificateRef)typeRef);
</span><span class="cx"> return;
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> case SecIdentity:
</span><span class="cx"> encode(encoder, (SecIdentityRef)(typeRef));
</span><span class="cx"> return;
</span><ins>+#endif
</ins><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">@@ -242,6 +250,7 @@
</span><span class="cx"> result = adoptCF(certificate.leakRef());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> case SecIdentity: {
</span><span class="cx"> RetainPtr<SecIdentityRef> identity;
</span><span class="cx"> if (!decode(decoder, identity))
</span><span class="lines">@@ -249,6 +258,7 @@
</span><span class="cx"> result = adoptCF(identity.leakRef());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> case SecKeychainItem: {
</span><span class="cx"> RetainPtr<SecKeychainItemRef> keychainItem;
</span><span class="lines">@@ -581,6 +591,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> void encode(ArgumentEncoder& encoder, SecIdentityRef identity)
</span><span class="cx"> {
</span><span class="cx"> SecCertificateRef certificate = nullptr;
</span><span class="lines">@@ -628,6 +639,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> void encode(ArgumentEncoder& encoder, SecKeychainItemRef keychainItem)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfArgumentCodersCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h (169657 => 169658)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2014-06-06 20:07:29 UTC (rev 169657)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.h 2014-06-06 20:34:26 UTC (rev 169658)
</span><span class="lines">@@ -78,9 +78,11 @@
</span><span class="cx"> void encode(ArgumentEncoder&, SecCertificateRef);
</span><span class="cx"> bool decode(ArgumentDecoder&, RetainPtr<SecCertificateRef>& result);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> // SecIdentityRef
</span><span class="cx"> void encode(ArgumentEncoder&, SecIdentityRef);
</span><span class="cx"> bool decode(ArgumentDecoder&, RetainPtr<SecIdentityRef>& result);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if HAVE(SEC_KEYCHAIN)
</span><span class="cx"> // SecKeychainItemRef
</span></span></pre>
</div>
</div>
</body>
</html>