| Index: content/child/webcrypto/algorithm_registry.cc
|
| diff --git a/content/child/webcrypto/algorithm_registry.cc b/content/child/webcrypto/algorithm_registry.cc
|
| index e45ec59902e069ffdebc97bef7ca649a95fb424d..5828a0c8d9bdce0e44bdee97f2535db27693c429 100644
|
| --- a/content/child/webcrypto/algorithm_registry.cc
|
| +++ b/content/child/webcrypto/algorithm_registry.cc
|
| @@ -30,7 +30,8 @@ class AlgorithmRegistry {
|
| rsa_pss_(CreatePlatformRsaPssImplementation()),
|
| ecdsa_(CreatePlatformEcdsaImplementation()),
|
| ecdh_(CreatePlatformEcdhImplementation()),
|
| - hkdf_(CreatePlatformHkdfImplementation()) {
|
| + hkdf_(CreatePlatformHkdfImplementation()),
|
| + pbkdf2_(CreatePlatformPbkdf2Implementation()) {
|
| PlatformInit();
|
| }
|
|
|
| @@ -64,6 +65,8 @@ class AlgorithmRegistry {
|
| return ecdh_.get();
|
| case blink::WebCryptoAlgorithmIdHkdf:
|
| return hkdf_.get();
|
| + case blink::WebCryptoAlgorithmIdPbkdf2:
|
| + return pbkdf2_.get();
|
| default:
|
| return NULL;
|
| }
|
| @@ -82,6 +85,7 @@ class AlgorithmRegistry {
|
| const scoped_ptr<AlgorithmImplementation> ecdsa_;
|
| const scoped_ptr<AlgorithmImplementation> ecdh_;
|
| const scoped_ptr<AlgorithmImplementation> hkdf_;
|
| + const scoped_ptr<AlgorithmImplementation> pbkdf2_;
|
| };
|
|
|
| } // namespace
|
|
|