| Index: public/platform/WebCryptoAlgorithm.h
|
| diff --git a/public/platform/WebCryptoAlgorithm.h b/public/platform/WebCryptoAlgorithm.h
|
| index 8bb50b8220afc076db06e501fa39db2b66f8f3c7..7df6f3aeddb7e45328dd32dc18f53e1c8500aca6 100644
|
| --- a/public/platform/WebCryptoAlgorithm.h
|
| +++ b/public/platform/WebCryptoAlgorithm.h
|
| @@ -71,8 +71,9 @@ enum WebCryptoAlgorithmId {
|
| WebCryptoAlgorithmIdEcdsa,
|
| WebCryptoAlgorithmIdEcdh,
|
| WebCryptoAlgorithmIdHkdf,
|
| + WebCryptoAlgorithmIdPbkdf2,
|
| #if INSIDE_BLINK
|
| - WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdHkdf,
|
| + WebCryptoAlgorithmIdLast = WebCryptoAlgorithmIdPbkdf2,
|
| #endif
|
| };
|
|
|
| @@ -103,6 +104,7 @@ enum WebCryptoAlgorithmParamsType {
|
| WebCryptoAlgorithmParamsTypeEcdhKeyDeriveParams,
|
| WebCryptoAlgorithmParamsTypeAesDerivedKeyParams,
|
| WebCryptoAlgorithmParamsTypeHkdfParams,
|
| + WebCryptoAlgorithmParamsTypePbkdf2Params,
|
| };
|
|
|
| struct WebCryptoAlgorithmInfo {
|
| @@ -135,6 +137,7 @@ class WebCryptoEcKeyImportParams;
|
| class WebCryptoEcdhKeyDeriveParams;
|
| class WebCryptoAesDerivedKeyParams;
|
| class WebCryptoHkdfParams;
|
| +class WebCryptoPbkdf2Params;
|
|
|
| class WebCryptoAlgorithmParams;
|
| class WebCryptoAlgorithmPrivate;
|
| @@ -194,6 +197,7 @@ public:
|
| BLINK_PLATFORM_EXPORT const WebCryptoEcdhKeyDeriveParams* ecdhKeyDeriveParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoAesDerivedKeyParams* aesDerivedKeyParams() const;
|
| BLINK_PLATFORM_EXPORT const WebCryptoHkdfParams* hkdfParams() const;
|
| + BLINK_PLATFORM_EXPORT const WebCryptoPbkdf2Params* pbkdf2Params() const;
|
|
|
| // Returns true if the provided algorithm ID is for a hash (in other words, SHA-*)
|
| BLINK_PLATFORM_EXPORT static bool isHash(WebCryptoAlgorithmId);
|
|
|