| Index: content/child/webcrypto/nss/aes_key_nss.h
|
| diff --git a/content/child/webcrypto/nss/aes_key_nss.h b/content/child/webcrypto/nss/aes_key_nss.h
|
| index e1e2ed3f064b15a3a1ed749507481ae54227c082..cf61268c609adb7284e692095a5b0b404d241e46 100644
|
| --- a/content/child/webcrypto/nss/aes_key_nss.h
|
| +++ b/content/child/webcrypto/nss/aes_key_nss.h
|
| @@ -36,13 +36,11 @@ class AesAlgorithm : public AlgorithmImplementation {
|
| AesAlgorithm(CK_MECHANISM_TYPE import_mechanism,
|
| const std::string& jwk_suffix);
|
|
|
| - virtual Status VerifyKeyUsagesBeforeGenerateKey(
|
| - blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE;
|
| -
|
| - virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE;
|
| + virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usage_mask,
|
| + blink::WebCryptoKey*,
|
| + blink::WebCryptoKey* key) const OVERRIDE;
|
|
|
| virtual Status VerifyKeyUsagesBeforeImportKey(
|
| blink::WebCryptoKeyFormat format,
|
|
|