| Index: content/child/webcrypto/nss/hmac_nss.cc
|
| diff --git a/content/child/webcrypto/nss/hmac_nss.cc b/content/child/webcrypto/nss/hmac_nss.cc
|
| index 40dadbe8a399e6dcbdbc4d5ec20dcd7b68e08aad..b539e8715ce299f2a21da8c44710a30dea4ab7a4 100644
|
| --- a/content/child/webcrypto/nss/hmac_nss.cc
|
| +++ b/content/child/webcrypto/nss/hmac_nss.cc
|
| @@ -58,7 +58,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| virtual Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE {
|
| + blink::WebCryptoKey* key) const override {
|
| const blink::WebCryptoHmacKeyGenParams* params =
|
| algorithm.hmacKeyGenParams();
|
|
|
| @@ -83,7 +83,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
|
|
| virtual Status VerifyKeyUsagesBeforeImportKey(
|
| blink::WebCryptoKeyFormat format,
|
| - blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE {
|
| + blink::WebCryptoKeyUsageMask usage_mask) const override {
|
| switch (format) {
|
| case blink::WebCryptoKeyFormatRaw:
|
| case blink::WebCryptoKeyFormatJwk:
|
| @@ -94,7 +94,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| }
|
|
|
| virtual Status VerifyKeyUsagesBeforeGenerateKey(
|
| - blink::WebCryptoKeyUsageMask usage_mask) const OVERRIDE {
|
| + blink::WebCryptoKeyUsageMask usage_mask) const override {
|
| return CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
|
| }
|
|
|
| @@ -102,7 +102,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE {
|
| + blink::WebCryptoKey* key) const override {
|
| const blink::WebCryptoAlgorithm& hash =
|
| algorithm.hmacImportParams()->hash();
|
|
|
| @@ -130,7 +130,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const OVERRIDE {
|
| + blink::WebCryptoKey* key) const override {
|
| const char* algorithm_name =
|
| GetJwkHmacAlgorithmName(algorithm.hmacImportParams()->hash().id());
|
| if (!algorithm_name)
|
| @@ -147,13 +147,13 @@ class HmacImplementation : public AlgorithmImplementation {
|
| }
|
|
|
| virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE {
|
| + std::vector<uint8_t>* buffer) const override {
|
| *buffer = SymKeyNss::Cast(key)->raw_key_data();
|
| return Status::Success();
|
| }
|
|
|
| virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const OVERRIDE {
|
| + std::vector<uint8_t>* buffer) const override {
|
| SymKeyNss* sym_key = SymKeyNss::Cast(key);
|
| const std::vector<uint8_t>& raw_data = sym_key->raw_key_data();
|
|
|
| @@ -174,7 +174,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| virtual Status Sign(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 {
|
| const blink::WebCryptoAlgorithm& hash =
|
| key.algorithm().hmacParams()->hash();
|
| PK11SymKey* sym_key = SymKeyNss::Cast(key)->key();
|
| @@ -213,7 +213,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| const blink::WebCryptoKey& key,
|
| const CryptoData& signature,
|
| const CryptoData& data,
|
| - bool* signature_match) const OVERRIDE {
|
| + bool* signature_match) const override {
|
| std::vector<uint8_t> result;
|
| Status status = Sign(algorithm, key, data, &result);
|
|
|
|
|