Implement HKDF for WebCrypto (blink-side)

Source/platform/exported/WebCryptoKeyAlgorithm.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 75 matching lines @@
     if (!WebCryptoAlgorithm::isHash(hash))
         return WebCryptoKeyAlgorithm();
     return WebCryptoKeyAlgorithm(id, adoptPtr(new WebCryptoRsaHashedKeyAlgorithmParams(modulusLengthBits, publicExponent, publicExponentSize, createHash(hash))));
 }
 
 WebCryptoKeyAlgorithm WebCryptoKeyAlgorithm::createEc(WebCryptoAlgorithmId id, WebCryptoNamedCurve namedCurve)
 {
     return WebCryptoKeyAlgorithm(id, adoptPtr(new WebCryptoEcKeyAlgorithmParams(namedCurve)));
 }
 
+WebCryptoKeyAlgorithm WebCryptoKeyAlgorithm::createKdf(WebCryptoAlgorithmId kdf)
+{
+    if (!WebCryptoAlgorithm::isKdf(kdf))
+        return WebCryptoKeyAlgorithm();
+    return WebCryptoKeyAlgorithm(kdf, adoptPtr(new WebCryptoKdfKeyAlgorithmParams()));
+}
+
 bool WebCryptoKeyAlgorithm::isNull() const
 {
     return m_private.isNull();
 }
 
 WebCryptoAlgorithmId WebCryptoKeyAlgorithm::id() const
 {
     ASSERT(!isNull());
     return m_private->id;
 }
@@ skipping 31 matching lines @@
 }
 
 WebCryptoEcKeyAlgorithmParams* WebCryptoKeyAlgorithm::ecParams() const
 {
     ASSERT(!isNull());
     if (paramsType() == WebCryptoKeyAlgorithmParamsTypeEc)
         return static_cast<WebCryptoEcKeyAlgorithmParams*>(m_private->params.get());
     return 0;
 }
 
+WebCryptoKdfKeyAlgorithmParams* WebCryptoKeyAlgorithm::kdfParams() const
+{
+    ASSERT(!isNull());
+    if (paramsType() == WebCryptoKeyAlgorithmParamsTypeKdf)
+        return static_cast<WebCryptoKdfKeyAlgorithmParams*>(m_private->params.get());
+    return 0;
+}
+
 void WebCryptoKeyAlgorithm::writeToDictionary(WebCryptoKeyAlgorithmDictionary* dict) const
 {
     ASSERT(!isNull());
     dict->setString("name", WebCryptoAlgorithm::lookupAlgorithmInfo(id())->name);
-    m_private->params.get()->writeToDictionary(dict);
+    if (m_private->params.get())

[eroman, 2015/01/07 00:40:31]

This change seems like it is sufficient, rather than defining an HkdfKeyParams.
See later comments. (To be clear I am cool with this changed line, but not
convinced on the addition of the new KdfKeyParams).

[nharper, 2015/01/08 00:58:39]

The introduction of KdfKeyParams was to make something marginally easier in
ScriptValueSerializerForModules.cpp, but I agree that there's no need for
creating a new class that stores nothing in it.

+        m_private->params.get()->writeToDictionary(dict);
 }
 
 void WebCryptoKeyAlgorithm::assign(const WebCryptoKeyAlgorithm& other)
 {
     m_private = other.m_private;
 }
 
 void WebCryptoKeyAlgorithm::reset()
 {
     m_private.reset();
 }
 
 } // namespace blink