| Index: content/child/webcrypto/nss/rsa_oaep_nss.cc
|
| diff --git a/content/child/webcrypto/nss/rsa_oaep_nss.cc b/content/child/webcrypto/nss/rsa_oaep_nss.cc
|
| index dac027baee32937fc10e5ce6217f8bbddae02e8c..d4866ae19be33ce4d992f0887de29d0cbcbdbbb8 100644
|
| --- a/content/child/webcrypto/nss/rsa_oaep_nss.cc
|
| +++ b/content/child/webcrypto/nss/rsa_oaep_nss.cc
|
| @@ -171,7 +171,7 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
|
| 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 {
|
| Status status = NssSupportsRsaOaep();
|
| if (status.IsError())
|
| return status;
|
| @@ -181,7 +181,7 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
|
|
|
| virtual Status VerifyKeyUsagesBeforeImportKey(
|
| blink::WebCryptoKeyFormat format,
|
| - blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE {
|
| + blink::WebCryptoKeyUsageMask usage_mask) const override {
|
| Status status = NssSupportsRsaOaep();
|
| if (status.IsError())
|
| return status;
|
| @@ -190,7 +190,7 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
|
| }
|
|
|
| virtual const char* GetJwkAlgorithm(
|
| - const blink::WebCryptoAlgorithmId hash) const OVERRIDE {
|
| + const blink::WebCryptoAlgorithmId hash) const override {
|
| switch (hash) {
|
| case blink::WebCryptoAlgorithmIdSha1:
|
| return "RSA-OAEP";
|
| @@ -208,7 +208,7 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
|
| virtual Status Encrypt(const blink::WebCryptoAlgorithm& algorithm,
|
| const blink::WebCryptoKey& key,
|
| const CryptoData& data,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE {
|
| + std::vector<uint8_t>* buffer) const override {
|
| if (key.type() != blink::WebCryptoKeyTypePublic)
|
| return Status::ErrorUnexpectedKeyType();
|
|
|
| @@ -223,7 +223,7 @@ class RsaOaepImplementation : public RsaHashedAlgorithm {
|
| virtual Status Decrypt(const blink::WebCryptoAlgorithm& algorithm,
|
| const blink::WebCryptoKey& key,
|
| const CryptoData& data,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE {
|
| + std::vector<uint8_t>* buffer) const override {
|
| if (key.type() != blink::WebCryptoKeyTypePrivate)
|
| return Status::ErrorUnexpectedKeyType();
|
|
|
|
|