| Index: content/child/webcrypto/openssl/rsa_key_openssl.h
|
| diff --git a/content/child/webcrypto/openssl/rsa_key_openssl.h b/content/child/webcrypto/openssl/rsa_key_openssl.h
|
| index 86a69316df475c93216a92d524c71748eb6083ab..73d75cd94437a6726cf1a70f1d0196df12d4e21b 100644
|
| --- a/content/child/webcrypto/openssl/rsa_key_openssl.h
|
| +++ b/content/child/webcrypto/openssl/rsa_key_openssl.h
|
| @@ -41,7 +41,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,
|
| @@ -49,38 +49,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 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 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 ExportKeyJwk(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE;
|
| + std::vector<uint8_t>* buffer) const override;
|
|
|
| private:
|
| blink::WebCryptoKeyUsageMask all_public_key_usages_;
|
|
|