Changeset 209191 in webkit

Timestamp:

Dec 1, 2016 11:42:30 AM (7 years ago)

Author:

jiewen_tan@apple.com

Message:

SubtleCrypto::deriveBits always return NOT_SUPPORTED_ERR for now
​https://bugs.webkit.org/show_bug.cgi?id=164745
<rdar://problem/29258118>

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

• WebCryptoAPI/idlharness-expected.txt:

Source/WebCore:

Since we don't support any cryptography algorithms that has deriveBits operations,
SubtleCrypto::deriveBits will always return NOT_SUPPORTED_ERR for now.

Test: crypto/subtle/deriveBits-malformed-parameters.html

• bindings/js/JSSubtleCryptoCustom.cpp:

(WebCore::normalizeCryptoAlgorithmParameters):
(WebCore::jsSubtleCryptoFunctionDeriveBitsPromise):
(WebCore::JSSubtleCrypto::deriveBits):

• crypto/SubtleCrypto.idl:

LayoutTests:

• crypto/subtle/deriveBits-malformed-parameters-expected.txt: Added.
• crypto/subtle/deriveBits-malformed-parameters.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/crypto/subtle/deriveBits-malformed-parameters-expected.txt (added)
• LayoutTests/crypto/subtle/deriveBits-malformed-parameters.html (added)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (modified) (4 diffs)
• Source/WebCore/crypto/SubtleCrypto.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        SubtleCrypto::deriveBits always return NOT_SUPPORTED_ERR for now
+        https://bugs.webkit.org/show_bug.cgi?id=164745
+        <rdar://problem/29258118>
+
+        Reviewed by Darin Adler.
+
+        * crypto/subtle/deriveBits-malformed-parameters-expected.txt: Added.
+        * crypto/subtle/deriveBits-malformed-parameters.html: Added.
+
 2016-12-01  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        SubtleCrypto::deriveBits always return NOT_SUPPORTED_ERR for now
+        https://bugs.webkit.org/show_bug.cgi?id=164745
+        <rdar://problem/29258118>
+
+        Reviewed by Darin Adler.
+
+        * WebCryptoAPI/idlharness-expected.txt:
+
 2016-11-30  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/imported/w3c/WebCryptoAPI/idlharness-expected.txt

@@ -58 +58 @@
 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 
-FAIL SubtleCrypto interface: crypto.subtle must inherit property "deriveBits" with the proper type (7) assert_inherits: property "deriveBits" not found in prototype chain
-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
+PASS SubtleCrypto interface: crypto.subtle must inherit property "deriveBits" with the proper type (7) 
+PASS SubtleCrypto interface: calling deriveBits(AlgorithmIdentifier,CryptoKey,unsigned long) on crypto.subtle with too few arguments must throw TypeError 
 PASS SubtleCrypto interface: crypto.subtle must inherit property "importKey" with the proper type (8) 
 PASS SubtleCrypto interface: calling importKey(KeyFormat,[object Object],[object Object],AlgorithmIdentifier,boolean,[object Object]) on crypto.subtle with too few arguments must throw TypeError 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-01  Jiewen Tan  <jiewen_tan@apple.com>
+
+        SubtleCrypto::deriveBits always return NOT_SUPPORTED_ERR for now
+        https://bugs.webkit.org/show_bug.cgi?id=164745
+        <rdar://problem/29258118>
+
+        Reviewed by Darin Adler.
+
+        Since we don't support any cryptography algorithms that has deriveBits operations,
+        SubtleCrypto::deriveBits will always return NOT_SUPPORTED_ERR for now.
+
+        Test: crypto/subtle/deriveBits-malformed-parameters.html
+
+        * bindings/js/JSSubtleCryptoCustom.cpp:
+        (WebCore::normalizeCryptoAlgorithmParameters):
+        (WebCore::jsSubtleCryptoFunctionDeriveBitsPromise):
+        (WebCore::JSSubtleCrypto::deriveBits):
+        * crypto/SubtleCrypto.idl:
+
 2016-12-01  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp

@@ -60 +60 @@
     Digest,
     DeriveKey,
+    DeriveBits,
     GenerateKey,
     ImportKey,
@@ -150 +151 @@
             break;
         case Operations::DeriveKey:
+        case Operations::DeriveBits:
             setDOMException(&state, NOT_SUPPORTED_ERR);
             return nullptr;
@@ -699 +701 @@
 }
 
+static void jsSubtleCryptoFunctionDeriveBitsPromise(ExecState& state, Ref<DeferredPromise>&& promise)
+{
+    VM& vm = state.vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    if (UNLIKELY(state.argumentCount() < 3)) {
+        promise->reject<JSValue>(createNotEnoughArgumentsError(&state));
+        return;
+    }
+
+    auto params = normalizeCryptoAlgorithmParameters(state, state.uncheckedArgument(0), Operations::DeriveBits);
+    RETURN_IF_EXCEPTION(scope, void());
+
+    // We should always return a NOT_SUPPORTED_ERR since we currently don't support any algorithms that has deriveBits operation.
+    ASSERT_NOT_REACHED();
+}
+
 static void jsSubtleCryptoFunctionGenerateKeyPromise(ExecState& state, Ref<DeferredPromise>&& promise)
 {
@@ -974 +993 @@
 }
 
+JSValue JSSubtleCrypto::deriveBits(ExecState& state)
+{
+    return callPromiseFunction<jsSubtleCryptoFunctionDeriveBitsPromise, PromiseExecutionScope::WindowOrWorker>(state);
+}
+
 JSValue JSSubtleCrypto::generateKey(ExecState& state)
 {

trunk/Source/WebCore/crypto/SubtleCrypto.idl

@@ -38 +38 @@
     [Custom] Promise<any> digest(AlgorithmIdentifier algorithm, BufferSource data);
     [Custom] Promise<any> deriveKey(AlgorithmIdentifier algorithm, CryptoKey baseKey, AlgorithmIdentifier derivedKeyType, boolean extractable, sequence<KeyUsage> keyUsages);
+    [Custom] Promise<ArrayBuffer> deriveBits(AlgorithmIdentifier algorithm, CryptoKey baseKey, unsigned long length);
     // FIXME: Should this return a Promise<(CryptoKey or CryptoKeyPair)>?
     [Custom] Promise<any> generateKey(AlgorithmIdentifier algorithm, boolean extractable, sequence<CryptoKeyUsage> keyUsages);