Chromium Code Reviews| Index: content/renderer/webcrypto/platform_crypto_nss.cc |
| diff --git a/content/renderer/webcrypto/platform_crypto_nss.cc b/content/renderer/webcrypto/platform_crypto_nss.cc |
| index 5874e244af2d84e81871832c2cf83151e35a3d31..dad547e8b6870f4b3d69ddef765997b2185d8d15 100644 |
| --- a/content/renderer/webcrypto/platform_crypto_nss.cc |
| +++ b/content/renderer/webcrypto/platform_crypto_nss.cc |
| @@ -1190,10 +1190,14 @@ Status UnwrapSymKeyAesKw(const CryptoData& wrapped_key_data, |
| if (!unwrapped_key) |
| return Status::Error(); |
| + blink::WebCryptoKeyAlgorithm key_algorithm; |
| + if (!CreateSecretKeyAlgorithm(algorithm, plaintext_length, &key_algorithm)) |
| + return Status::ErrorUnexpected(); |
| + |
| *key = blink::WebCryptoKey::create(new SymKey(unwrapped_key.Pass()), |
| blink::WebCryptoKeyTypeSecret, |
| extractable, |
| - algorithm, |
| + key_algorithm, |
|
eroman
2014/03/04 02:55:14
Not sure I understand this change --> wouldn't it
padolph
2014/03/04 17:38:20
Yes, it's an artifact of my workflow. This is a fi
|
| usage_mask); |
| return Status::Success(); |
| } |