Implement HKDF for WebCrypto (blink-side)

Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp

Index: Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp
diff --git a/Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp b/Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp
index 08add9b64a162f1c2349c1a1f0b7f4b41428265f..3fe66ec2490abb882a9db3c8b5b1b306a7627e0f 100644
--- a/Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp
+++ b/Source/bindings/modules/v8/ScriptValueSerializerForModules.cpp
@@ -30,6 +30,7 @@ enum CryptoKeyAlgorithmTag {
     RsaPssTag = 13,
     EcdsaTag = 14,
     EcdhTag = 15,
+    HkdfTag = 16,
     // Maximum allowed value is 2^32-1
 };
 
@@ -61,6 +62,7 @@ enum CryptoKeySubTag {
     // ID 3 was used by RsaKeyTag, while still behind experimental flag.
     RsaHashedKeyTag = 4,
     EcKeyTag = 5,
+    NoParamsKeyTag = 6,
     // Maximum allowed value is 255
 };
 
@@ -122,8 +124,8 @@ bool SerializedScriptValueWriterForModules::writeCryptoKey(const WebCryptoKey& k
         doWriteEcKey(key);
         break;
     case WebCryptoKeyAlgorithmParamsTypeNone:
-        ASSERT_NOT_REACHED();
-        return false;
+        ASSERT(WebCryptoAlgorithm::isKdf(key.algorithm().id()));

[eroman, 2015/01/09 22:12:45]

Can you move this assertion into doWriteKeyWithoutParams() ?

[nharper, 2015/01/09 22:29:02]

Done.

+        doWriteKeyWithoutParams(key);

[eroman, 2015/01/09 22:12:45]

Please add a break statement for symmetry with the other lines (more future
proof in case someone adds a new case statement).

(Although this is the last of the key types described by WebCrypto)

[nharper, 2015/01/09 22:29:02]

Done.

     }
 
     doWriteKeyUsages(key.usages(), key.extractable());
@@ -184,6 +186,13 @@ void SerializedScriptValueWriterForModules::doWriteEcKey(const WebCryptoKey& key
     doWriteNamedCurve(key.algorithm().ecParams()->namedCurve());
 }
 
+void SerializedScriptValueWriterForModules::doWriteKeyWithoutParams(const WebCryptoKey& key)
+{
+    append(static_cast<uint8_t>(NoParamsKeyTag));
+
+    doWriteAlgorithmId(key.algorithm().id());
+}
+
 void SerializedScriptValueWriterForModules::doWriteAlgorithmId(WebCryptoAlgorithmId id)
 {
     switch (id) {
@@ -215,6 +224,8 @@ void SerializedScriptValueWriterForModules::doWriteAlgorithmId(WebCryptoAlgorith
         return doWriteUint32(EcdsaTag);
     case WebCryptoAlgorithmIdEcdh:
         return doWriteUint32(EcdhTag);
+    case WebCryptoAlgorithmIdHkdf:
+        return doWriteUint32(HkdfTag);
     }
     ASSERT_NOT_REACHED();
 }
@@ -359,6 +370,10 @@ bool SerializedScriptValueReaderForModules::readCryptoKey(v8::Handle<v8::Value>*
         if (!doReadEcKey(algorithm, type))
             return false;
         break;
+    case NoParamsKeyTag:
+        if (!doReadKeyWithoutParams(algorithm, type))
+            return false;
+        break;
     default:
         return false;
     }
@@ -458,6 +473,16 @@ bool SerializedScriptValueReaderForModules::doReadEcKey(WebCryptoKeyAlgorithm& a
     return !algorithm.isNull();
 }
 
+bool SerializedScriptValueReaderForModules::doReadKeyWithoutParams(WebCryptoKeyAlgorithm& algorithm, WebCryptoKeyType& type)
+{
+    WebCryptoAlgorithmId id;
+    if (!doReadAlgorithmId(id))
+        return false;
+    algorithm = WebCryptoKeyAlgorithm::createWithoutParams(id);
+    type = WebCryptoKeyTypeSecret;
+    return !algorithm.isNull();
+}
+
 bool SerializedScriptValueReaderForModules::doReadAlgorithmId(WebCryptoAlgorithmId& id)
 {
     uint32_t rawId;
@@ -507,6 +532,9 @@ bool SerializedScriptValueReaderForModules::doReadAlgorithmId(WebCryptoAlgorithm
     case EcdhTag:
         id = WebCryptoAlgorithmIdEcdh;
         return true;
+    case HkdfTag:
+        id = WebCryptoAlgorithmIdHkdf;
+        return true;
     }
 
     return false;