<!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>[163999] trunk</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/163999">163999</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 16:39:21 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Add a C API to get WebCrypto master key from a client
https://bugs.webkit.org/show_bug.cgi?id=128702
Reviewed by Anders Carlsson.
Source/WebKit2:
Added a new version of WKContextClient, with a function that returns the key.
* UIProcess/API/C/WKContext.h:
* UIProcess/WebContextClient.cpp:
(WebKit::WebContextClient::copyWebCryptoMasterKey):
* UIProcess/WebContextClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::wrapCryptoKey):
(WebKit::WebPageProxy::unwrapCryptoKey):
* UIProcess/mac/WebPageProxyMac.mm:
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::copyWebCryptoMasterKey):
(WTR::TestController::initialize):
Return a hardcoded key.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextClientcpp">trunk/Source/WebKit2/UIProcess/WebContextClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextClienth">trunk/Source/WebKit2/UIProcess/WebContextClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-12 Alexey Proskuryakov <ap@apple.com>
+
+ [WK2] Add a C API to get WebCrypto master key from a client
+ https://bugs.webkit.org/show_bug.cgi?id=128702
+
+ Reviewed by Anders Carlsson.
+
+ Added a new version of WKContextClient, with a function that returns the key.
+
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/WebContextClient.cpp:
+ (WebKit::WebContextClient::copyWebCryptoMasterKey):
+ * UIProcess/WebContextClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::wrapCryptoKey):
+ (WebKit::WebPageProxy::unwrapCryptoKey):
+ * UIProcess/mac/WebPageProxyMac.mm:
+
</ins><span class="cx"> 2014-02-12 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add destinationFrame property to WKNavigationAction
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> typedef void (*WKContextPlugInAutoStartOriginHashesChangedCallback)(WKContextRef context, const void *clientInfo);
</span><span class="cx"> typedef void (*WKContextNetworkProcessDidCrashCallback)(WKContextRef context, const void *clientInfo);
</span><span class="cx"> typedef void (*WKContextPlugInInformationBecameAvailableCallback)(WKContextRef context, WKArrayRef plugIn, const void *clientInfo);
</span><ins>+typedef WKDataRef (*WKContextCopyWebCryptoMasterKeyCallback)(WKContextRef context, const void *clientInfo);
</ins><span class="cx">
</span><span class="cx"> typedef struct WKContextClientBase {
</span><span class="cx"> int version;
</span><span class="lines">@@ -62,7 +63,19 @@
</span><span class="cx"> WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
</span><span class="cx"> } WKContextClientV0;
</span><span class="cx">
</span><del>-enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
</del><ins>+typedef struct WKContextClientV1 {
+ WKContextClientBase base;
+
+ // Version 0.
+ WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
+ WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
+ WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
+
+ // Version 1.
+ WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
+} WKContextClientV1;
+
+enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
</ins><span class="cx"> typedef struct WKContextClient {
</span><span class="cx"> int version;
</span><span class="cx"> const void * clientInfo;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextClient.cpp (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextClient.cpp 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/UIProcess/WebContextClient.cpp 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -58,4 +58,12 @@
</span><span class="cx"> m_client.plugInInformationBecameAvailable(toAPI(context), toAPI(plugInInfo), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+PassRefPtr<API::Data> WebContextClient::copyWebCryptoMasterKey(WebContext* context)
+{
+ if (!m_client.copyWebCryptoMasterKey)
+ return nullptr;
+
+ return adoptRef(toImpl(m_client.copyWebCryptoMasterKey(toAPI(context), m_client.base.clientInfo)));
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextClient.h (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextClient.h 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/UIProcess/WebContextClient.h 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx"> #define WebContextClient_h
</span><span class="cx">
</span><span class="cx"> #include "APIClient.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "WKContext.h"
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Array;
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKContextClientBase> {
</span><del>- typedef std::tuple<WKContextClientV0> Versions;
</del><ins>+ typedef std::tuple<WKContextClientV0, WKContextClientV1> Versions;
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -46,6 +47,7 @@
</span><span class="cx"> void plugInAutoStartOriginHashesChanged(WebContext*);
</span><span class="cx"> void networkProcessDidCrash(WebContext*);
</span><span class="cx"> void plugInInformationBecameAvailable(WebContext*, API::Array*);
</span><ins>+ PassRefPtr<API::Data> copyWebCryptoMasterKey(WebContext*);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -4483,15 +4483,25 @@
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx"> void WebPageProxy::wrapCryptoKey(const Vector<uint8_t>& key, bool& succeeded, Vector<uint8_t>& wrappedKey)
</span><span class="cx"> {
</span><del>- Vector<uint8_t> masterKey(16);
- memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
</del><ins>+ RefPtr<API::Data> keyData = m_process->context().client().copyWebCryptoMasterKey(&m_process->context());
+ if (!keyData) {
+ succeeded = false;
+ return;
+ }
+
+ Vector<uint8_t> masterKey = keyData->dataReference().vector();
</ins><span class="cx"> succeeded = wrapSerializedCryptoKey(masterKey, key, wrappedKey);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, bool& succeeded, Vector<uint8_t>& key)
</span><span class="cx"> {
</span><del>- Vector<uint8_t> masterKey(16);
- memset(masterKey.data(), 0, masterKey.size()); // FIXME: Not implemented yet, will be getting a key from client.
</del><ins>+ RefPtr<API::Data> keyData = m_process->context().client().copyWebCryptoMasterKey(&m_process->context());
+ if (!keyData) {
+ succeeded = false;
+ return;
+ }
+
+ Vector<uint8_t> masterKey = keyData->dataReference().vector();
</ins><span class="cx"> succeeded = unwrapSerializedCryptoKey(masterKey, wrappedKey, key);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><ins>+#import "WebContext.h"
</ins><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <WebCore/DictationAlternative.h>
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Tools/ChangeLog 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-12 Alexey Proskuryakov <ap@apple.com>
+
+ [WK2] Add a C API to get WebCrypto master key from a client
+ https://bugs.webkit.org/show_bug.cgi?id=128702
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::copyWebCryptoMasterKey):
+ (WTR::TestController::initialize):
+ Return a hardcoded key.
+
</ins><span class="cx"> 2014-02-12 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> Upstream iOS old-run-webkit-tests for use with DumpRenderTree in the iOS Simulator
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (163998 => 163999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-13 00:38:25 UTC (rev 163998)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-02-13 00:39:21 UTC (rev 163999)
</span><span class="lines">@@ -81,6 +81,12 @@
</span><span class="cx"> return staticBlankURL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static WKDataRef copyWebCryptoMasterKey(WKContextRef, const void*)
+{
+ // Any 128 bit key would do, all we need for testing is to implement the callback.
+ return WKDataCreate((const uint8_t*)"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", 16);
+}
+
</ins><span class="cx"> static TestController* controller;
</span><span class="cx">
</span><span class="cx"> TestController& TestController::shared()
</span><span class="lines">@@ -336,6 +342,15 @@
</span><span class="cx">
</span><span class="cx"> platformInitializeContext();
</span><span class="cx">
</span><ins>+ WKContextClientV1 contextClient = {
+ { 1, this },
+ nullptr, // plugInAutoStartOriginHashesChanged
+ nullptr, // networkProcessDidCrash,
+ nullptr, // plugInInformationBecameAvailable,
+ copyWebCryptoMasterKey
+ };
+ WKContextSetClient(m_context.get(), &contextClient.base);
+
</ins><span class="cx"> WKContextInjectedBundleClientV1 injectedBundleClient = {
</span><span class="cx"> { 1, this },
</span><span class="cx"> didReceiveMessageFromInjectedBundle,
</span></span></pre>
</div>
</div>
</body>
</html>