| Index: public/platform/WebCryptoAlgorithm.h
|
| diff --git a/public/platform/WebCryptoAlgorithm.h b/public/platform/WebCryptoAlgorithm.h
|
| index 63dcdaa55afd172f4a002be7548ce89a56085d60..48a5dd066e507eda2c6a14ad21dd2ce0b0aa423b 100644
|
| --- a/public/platform/WebCryptoAlgorithm.h
|
| +++ b/public/platform/WebCryptoAlgorithm.h
|
| @@ -70,8 +70,9 @@ enum WebCryptoAlgorithmId {
|
| WebCryptoAlgorithmIdRsaPss,
|
| WebCryptoAlgorithmIdEcdsa,
|
| WebCryptoAlgorithmIdEcdh,
|
| + WebCryptoAlgorithmIdHkdf,
|
| #if INSIDE_BLINK
|
| - WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdEcdh,
|
| + WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdHkdf,
|
| #endif
|
| };
|
|
|
| @@ -101,6 +102,7 @@ enum WebCryptoAlgorithmParamsType {
|
| WebCryptoAlgorithmParamsTypeEcKeyImportParams,
|
| WebCryptoAlgorithmParamsTypeEcdhKeyDeriveParams,
|
| WebCryptoAlgorithmParamsTypeAesDerivedKeyParams,
|
| + WebCryptoAlgorithmParamsTypeHkdfParams,
|
| };
|
|
|
| struct WebCryptoAlgorithmInfo {
|
| @@ -132,6 +134,7 @@ class WebCryptoEcKeyGenParams;
|
| class WebCryptoEcKeyImportParams;
|
| class WebCryptoEcdhKeyDeriveParams;
|
| class WebCryptoAesDerivedKeyParams;
|
| +class WebCryptoHkdfParams;
|
|
|
| class WebCryptoAlgorithmParams;
|
| class WebCryptoAlgorithmPrivate;
|
| @@ -190,6 +193,7 @@ public:
|
| 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);
|
|
|