Implement HKDF for WebCrypto (blink-side)

public/platform/WebCryptoAlgorithm.h

 /*
  * Copyright (C) 2013 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 52 matching lines @@
     WebCryptoAlgorithmIdSha256,
     WebCryptoAlgorithmIdSha384,
     WebCryptoAlgorithmIdSha512,
     WebCryptoAlgorithmIdAesGcm,
     WebCryptoAlgorithmIdRsaOaep,
     WebCryptoAlgorithmIdAesCtr,
     WebCryptoAlgorithmIdAesKw,
     WebCryptoAlgorithmIdRsaPss,
     WebCryptoAlgorithmIdEcdsa,
     WebCryptoAlgorithmIdEcdh,
+    WebCryptoAlgorithmIdHkdf,
 #if INSIDE_BLINK
-    WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdEcdh,
+    WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdHkdf,
 #endif
 };
 
 enum WebCryptoNamedCurve {
     WebCryptoNamedCurveP256,
     WebCryptoNamedCurveP384,
     WebCryptoNamedCurveP521,
 #if INSIDE_BLINK
     WebCryptoNamedCurveLast = WebCryptoNamedCurveP521,
 #endif
 };
 
 enum WebCryptoAlgorithmParamsType {
     WebCryptoAlgorithmParamsTypeNone,
     WebCryptoAlgorithmParamsTypeAesCbcParams,
     WebCryptoAlgorithmParamsTypeAesKeyGenParams,
     WebCryptoAlgorithmParamsTypeHmacImportParams,
     WebCryptoAlgorithmParamsTypeHmacKeyGenParams,
     WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams,
     WebCryptoAlgorithmParamsTypeRsaHashedImportParams,
     WebCryptoAlgorithmParamsTypeAesGcmParams,
     WebCryptoAlgorithmParamsTypeRsaOaepParams,
     WebCryptoAlgorithmParamsTypeAesCtrParams,
     WebCryptoAlgorithmParamsTypeRsaPssParams,
     WebCryptoAlgorithmParamsTypeEcdsaParams,
     WebCryptoAlgorithmParamsTypeEcKeyGenParams,
     WebCryptoAlgorithmParamsTypeEcKeyImportParams,
     WebCryptoAlgorithmParamsTypeEcdhKeyDeriveParams,
     WebCryptoAlgorithmParamsTypeAesDerivedKeyParams,
+    WebCryptoAlgorithmParamsTypeHkdfParams,
 };
 
 struct WebCryptoAlgorithmInfo {
     typedef char ParamsTypeOrUndefined;
     static const ParamsTypeOrUndefined Undefined = -1;
 
     // The canonical (case-sensitive) name for the algorithm as a
     // null-terminated C-string literal.
     const char* name;
 
@@ skipping 11 matching lines @@
 class WebCryptoRsaOaepParams;
 class WebCryptoAesCtrParams;
 class WebCryptoRsaHashedKeyGenParams;
 class WebCryptoRsaHashedImportParams;
 class WebCryptoRsaPssParams;
 class WebCryptoEcdsaParams;
 class WebCryptoEcKeyGenParams;
 class WebCryptoEcKeyImportParams;
 class WebCryptoEcdhKeyDeriveParams;
 class WebCryptoAesDerivedKeyParams;
+class WebCryptoHkdfParams;
 
 class WebCryptoAlgorithmParams;
 class WebCryptoAlgorithmPrivate;
 
 // The WebCryptoAlgorithm represents a normalized algorithm and its parameters.
 //   * Immutable
 //   * Threadsafe
 //   * Copiable (cheaply)
 //
 // If WebCryptoAlgorithm "isNull()" then it is invalid to call any of the other
@@ skipping 38 matching lines @@
     BLINK_PLATFORM_EXPORT const WebCryptoRsaOaepParams* rsaOaepParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoAesCtrParams* aesCtrParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoRsaHashedImportParams* rsaHashedImportParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoRsaHashedKeyGenParams* rsaHashedKeyGenParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoRsaPssParams* rsaPssParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoEcdsaParams* ecdsaParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoEcKeyGenParams* ecKeyGenParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoEcKeyImportParams* ecKeyImportParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoEcdhKeyDeriveParams* ecdhKeyDeriveParams() const;
     BLINK_PLATFORM_EXPORT const WebCryptoAesDerivedKeyParams* aesDerivedKeyParams() const;
+    BLINK_PLATFORM_EXPORT const WebCryptoHkdfParams* hkdfParams() const;
 
     // Returns true if the provided algorithm ID is for a hash (in other words, SHA-*)
     BLINK_PLATFORM_EXPORT static bool isHash(WebCryptoAlgorithmId);
+    // Returns true iff the provided algorithm ID is for a key derivation function

[eroman, 2015/01/09 03:07:29]

"iff" as in "if and only if" ?

I don't like using "iff" in comments. To readers who didn't study math in
English it just reads like a typo.

Drop the second "f" and it is still just as clear.

[nharper, 2015/01/09 04:45:52]

Done.

+    BLINK_PLATFORM_EXPORT static bool isKdf(WebCryptoAlgorithmId);
 
 private:
     BLINK_PLATFORM_EXPORT void assign(const WebCryptoAlgorithm& other);
     BLINK_PLATFORM_EXPORT void reset();
 
     WebPrivatePtr<WebCryptoAlgorithmPrivate> m_private;
 };
 
 } // namespace blink
 
 #endif