<!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>[209166] 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/209166">209166</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 17:11:11 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>SubtleCrypto::deriveKey always return NOT_SUPPORTED_ERR for now
https://bugs.webkit.org/show_bug.cgi?id=164744
<rdar://problem/29258083>
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* WebCryptoAPI/idlharness-expected.txt:
Source/WebCore:
Since we don't support any cryptography algorithms that has deriveKey operations,
SubtleCrypto::deriveKey will always return NOT_SUPPORTED_ERR for now.
Test: crypto/subtle/deriveKey-malformed-parameters.html
* bindings/js/JSSubtleCryptoCustom.cpp:
(WebCore::normalizeCryptoAlgorithmParameters):
(WebCore::jsSubtleCryptoFunctionDeriveKeyPromise):
(WebCore::JSSubtleCrypto::deriveKey):
* crypto/SubtleCrypto.idl:
LayoutTests:
* crypto/subtle/deriveKey-malformed-parameters-expected.txt: Added.
* crypto/subtle/deriveKey-malformed-parameters.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cWebCryptoAPIidlharnessexpectedtxt">trunk/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecryptoSubtleCryptoidl">trunk/Source/WebCore/crypto/SubtleCrypto.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscryptosubtlederiveKeymalformedparametersexpectedtxt">trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters-expected.txt</a></li>
<li><a href="#trunkLayoutTestscryptosubtlederiveKeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-30 Jiewen Tan <jiewen_tan@apple.com>
+
+ SubtleCrypto::deriveKey always return NOT_SUPPORTED_ERR for now
+ https://bugs.webkit.org/show_bug.cgi?id=164744
+ <rdar://problem/29258083>
+
+ Reviewed by Darin Adler.
+
+ * crypto/subtle/deriveKey-malformed-parameters-expected.txt: Added.
+ * crypto/subtle/deriveKey-malformed-parameters.html: Added.
+
</ins><span class="cx"> 2016-11-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::digest to match the latest spec
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlederiveKeymalformedparametersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters-expected.txt (0 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters-expected.txt 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test deriveKey operation with malformed parameters
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS crypto.subtle.deriveKey() rejected promise with TypeError: Not enough arguments.
+PASS crypto.subtle.deriveKey(1) rejected promise with TypeError: Not enough arguments.
+PASS crypto.subtle.deriveKey(1, 2) rejected promise with TypeError: Not enough arguments.
+PASS crypto.subtle.deriveKey(1, 2, 3) rejected promise with TypeError: Not enough arguments.
+PASS crypto.subtle.deriveKey(1, 2, 3, 4) rejected promise with TypeError: Not enough arguments.
+PASS crypto.subtle.deriveKey("ECDH", 2, 3, 4, 5) rejected promise with NotSupportedError (DOM Exception 9): The operation is not supported..
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscryptosubtlederiveKeymalformedparametershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters.html (0 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/deriveKey-malformed-parameters.html 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../resources/common.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+description("Test deriveKey operation with malformed parameters");
+
+// Not enough arguments.
+shouldReject('crypto.subtle.deriveKey()');
+shouldReject('crypto.subtle.deriveKey(1)');
+shouldReject('crypto.subtle.deriveKey(1, 2)');
+shouldReject('crypto.subtle.deriveKey(1, 2, 3)');
+shouldReject('crypto.subtle.deriveKey(1, 2, 3, 4)');
+// Not support.
+shouldReject('crypto.subtle.deriveKey("ECDH", 2, 3, 4, 5)');
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-30 Jiewen Tan <jiewen_tan@apple.com>
+
+ SubtleCrypto::deriveKey always return NOT_SUPPORTED_ERR for now
+ https://bugs.webkit.org/show_bug.cgi?id=164744
+ <rdar://problem/29258083>
+
+ Reviewed by Darin Adler.
+
+ * WebCryptoAPI/idlharness-expected.txt:
+
</ins><span class="cx"> 2016-11-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::digest to match the latest spec
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cWebCryptoAPIidlharnessexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> PASS SubtleCrypto interface: calling digest(AlgorithmIdentifier,BufferSource) on crypto.subtle with too few arguments must throw TypeError
</span><span class="cx"> PASS SubtleCrypto interface: crypto.subtle must inherit property "generateKey" with the proper type (5)
</span><span class="cx"> PASS SubtleCrypto interface: calling generateKey(AlgorithmIdentifier,boolean,[object Object]) on crypto.subtle with too few arguments must throw TypeError
</span><del>-FAIL SubtleCrypto interface: crypto.subtle must inherit property "deriveKey" with the proper type (6) assert_inherits: property "deriveKey" not found in prototype chain
-FAIL SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier,CryptoKey,AlgorithmIdentifier,boolean,[object Object]) on crypto.subtle with too few arguments must throw TypeError assert_inherits: property "deriveKey" not found in prototype chain
</del><ins>+PASS SubtleCrypto interface: crypto.subtle must inherit property "deriveKey" with the proper type (6)
+PASS SubtleCrypto interface: calling deriveKey(AlgorithmIdentifier,CryptoKey,AlgorithmIdentifier,boolean,[object Object]) on crypto.subtle with too few arguments must throw TypeError
</ins><span class="cx"> FAIL SubtleCrypto interface: crypto.subtle must inherit property "deriveBits" with the proper type (7) assert_inherits: property "deriveBits" not found in prototype chain
</span><span class="cx"> FAIL SubtleCrypto interface: calling deriveBits(AlgorithmIdentifier,CryptoKey,unsigned long) on crypto.subtle with too few arguments must throw TypeError assert_inherits: property "deriveBits" not found in prototype chain
</span><span class="cx"> PASS SubtleCrypto interface: crypto.subtle must inherit property "importKey" with the proper type (8)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-11-30 Jiewen Tan <jiewen_tan@apple.com>
+
+ SubtleCrypto::deriveKey always return NOT_SUPPORTED_ERR for now
+ https://bugs.webkit.org/show_bug.cgi?id=164744
+ <rdar://problem/29258083>
+
+ Reviewed by Darin Adler.
+
+ Since we don't support any cryptography algorithms that has deriveKey operations,
+ SubtleCrypto::deriveKey will always return NOT_SUPPORTED_ERR for now.
+
+ Test: crypto/subtle/deriveKey-malformed-parameters.html
+
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ (WebCore::normalizeCryptoAlgorithmParameters):
+ (WebCore::jsSubtleCryptoFunctionDeriveKeyPromise):
+ (WebCore::JSSubtleCrypto::deriveKey):
+ * crypto/SubtleCrypto.idl:
+
</ins><span class="cx"> 2016-11-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::digest to match the latest spec
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> Sign,
</span><span class="cx"> Verify,
</span><span class="cx"> Digest,
</span><ins>+ DeriveKey,
</ins><span class="cx"> GenerateKey,
</span><span class="cx"> ImportKey,
</span><span class="cx"> WrapKey,
</span><span class="lines">@@ -147,6 +148,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><ins>+ case Operations::DeriveKey:
+ setDOMException(&state, NOT_SUPPORTED_ERR);
+ return nullptr;
</ins><span class="cx"> case Operations::GenerateKey:
</span><span class="cx"> switch (*identifier) {
</span><span class="cx"> case CryptoAlgorithmIdentifier::RSAES_PKCS1_v1_5: {
</span><span class="lines">@@ -677,6 +681,23 @@
</span><span class="cx"> algorithm->digest(WTFMove(data), WTFMove(callback), WTFMove(exceptionCallback), *scriptExecutionContextFromExecState(&state), subtle->wrapped().workQueue());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void jsSubtleCryptoFunctionDeriveKeyPromise(ExecState& state, Ref<DeferredPromise>&& promise)
+{
+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ if (UNLIKELY(state.argumentCount() < 5)) {
+ promise->reject<JSValue>(createNotEnoughArgumentsError(&state));
+ return;
+ }
+
+ auto params = normalizeCryptoAlgorithmParameters(state, state.uncheckedArgument(0), Operations::DeriveKey);
+ RETURN_IF_EXCEPTION(scope, void());
+
+ // We should always return a NOT_SUPPORTED_ERR since we currently don't support any algorithms that has deriveKey operation.
+ ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> static void jsSubtleCryptoFunctionGenerateKeyPromise(ExecState& state, Ref<DeferredPromise>&& promise)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state.vm();
</span><span class="lines">@@ -947,6 +968,11 @@
</span><span class="cx"> return callPromiseFunction<jsSubtleCryptoFunctionDigestPromise, PromiseExecutionScope::WindowOrWorker>(state);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSValue JSSubtleCrypto::deriveKey(ExecState& state)
+{
+ return callPromiseFunction<jsSubtleCryptoFunctionDeriveKeyPromise, PromiseExecutionScope::WindowOrWorker>(state);
+}
+
</ins><span class="cx"> JSValue JSSubtleCrypto::generateKey(ExecState& state)
</span><span class="cx"> {
</span><span class="cx"> return callPromiseFunction<jsSubtleCryptoFunctionGenerateKeyPromise, PromiseExecutionScope::WindowOrWorker>(state);
</span></span></pre></div>
<a id="trunkSourceWebCorecryptoSubtleCryptoidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/SubtleCrypto.idl (209165 => 209166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/crypto/SubtleCrypto.idl 2016-12-01 01:03:02 UTC (rev 209165)
+++ trunk/Source/WebCore/crypto/SubtleCrypto.idl 2016-12-01 01:11:11 UTC (rev 209166)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> [Custom] Promise<any> sign(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource data);
</span><span class="cx"> [Custom] Promise<any> verify(AlgorithmIdentifier algorithm, CryptoKey key, BufferSource signature, BufferSource data);
</span><span class="cx"> [Custom] Promise<any> digest(AlgorithmIdentifier algorithm, BufferSource data);
</span><ins>+ [Custom] Promise<any> deriveKey(AlgorithmIdentifier algorithm, CryptoKey baseKey, AlgorithmIdentifier derivedKeyType, boolean extractable, sequence<KeyUsage> keyUsages);
</ins><span class="cx"> // FIXME: Should this return a Promise<(CryptoKey or CryptoKeyPair)>?
</span><span class="cx"> [Custom] Promise<any> generateKey(AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);
</span><span class="cx"> [Custom] Promise<CryptoKey> importKey(KeyFormat format, (BufferSource or JsonWebKey) keyData, AlgorithmIdentifier algorithm, boolen extractable, sequence<CryptoKeyUsage> keyUsages);
</span></span></pre>
</div>
</div>
</body>
</html>