| Index: content/child/webcrypto/nss/rsa_key_nss.h
|
| diff --git a/content/child/webcrypto/nss/rsa_key_nss.h b/content/child/webcrypto/nss/rsa_key_nss.h
|
| index b929192a5bb0142252c107fc11771cff5ac76205..f83ad5c66552808d4e2ba2737dcab17b31dec3a6 100644
|
| --- a/content/child/webcrypto/nss/rsa_key_nss.h
|
| +++ b/content/child/webcrypto/nss/rsa_key_nss.h
|
| @@ -46,7 +46,7 @@ class RsaHashedAlgorithm : public AlgorithmImplementation {
|
| virtual Status VerifyKeyUsagesBeforeGenerateKeyPair(
|
| blink::WebCryptoKeyUsageMask combined_usage_mask,
|
| blink::WebCryptoKeyUsageMask* public_usage_mask,
|
| - blink::WebCryptoKeyUsageMask* private_usage_mask) const OVERRIDE;
|
| + blink::WebCryptoKeyUsageMask* private_usage_mask) const override;
|
|
|
| virtual Status GenerateKeyPair(
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| @@ -54,38 +54,38 @@ class RsaHashedAlgorithm : public AlgorithmImplementation {
|
| blink::WebCryptoKeyUsageMask public_usage_mask,
|
| blink::WebCryptoKeyUsageMask private_usage_mask,
|
| blink::WebCryptoKey* public_key,
|
| - blink::WebCryptoKey* private_key) const OVERRIDE;
|
| + blink::WebCryptoKey* private_key) const override;
|
|
|
| virtual Status VerifyKeyUsagesBeforeImportKey(
|
| blink::WebCryptoKeyFormat format,
|
| - blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE;
|
| + blink::WebCryptoKeyUsageMask usage_mask) const override;
|
|
|
| virtual Status ImportKeyPkcs8(const CryptoData& key_data,
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE;
|
| + blink::WebCryptoKey* key) const override;
|
|
|
| virtual Status ImportKeySpki(const CryptoData& key_data,
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE;
|
| + blink::WebCryptoKey* key) const override;
|
|
|
| virtual Status ExportKeyPkcs8(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE;
|
| + std::vector<uint8_t>* buffer) const override;
|
|
|
| virtual Status ExportKeySpki(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE;
|
| + std::vector<uint8_t>* buffer) const override;
|
|
|
| virtual Status ImportKeyJwk(const CryptoData& key_data,
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE;
|
| + blink::WebCryptoKey* key) const override;
|
|
|
| virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE;
|
| + std::vector<uint8_t>* buffer) const override;
|
|
|
| private:
|
| CK_FLAGS generate_flags_;
|
|
|