| Index: content/child/webcrypto/openssl/hmac_openssl.cc
|
| diff --git a/content/child/webcrypto/openssl/hmac_openssl.cc b/content/child/webcrypto/openssl/hmac_openssl.cc
|
| index f618501c02b7cbecacf676bb4cb9fde31d0d1ac7..946a2bc7d1f2a7d66c6cfca2121d58f387d57e6b 100644
|
| --- a/content/child/webcrypto/openssl/hmac_openssl.cc
|
| +++ b/content/child/webcrypto/openssl/hmac_openssl.cc
|
| @@ -70,10 +70,10 @@ class HmacImplementation : public AlgorithmImplementation {
|
| public:
|
| HmacImplementation() {}
|
|
|
| - virtual Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - GenerateKeyResult* result) const override {
|
| + Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usage_mask,
|
| + GenerateKeyResult* result) const override {
|
| Status status = CheckKeyCreationUsages(kAllKeyUsages, usage_mask);
|
| if (status.IsError())
|
| return status;
|
| @@ -94,7 +94,7 @@ class HmacImplementation : public AlgorithmImplementation {
|
| result);
|
| }
|
|
|
| - virtual Status VerifyKeyUsagesBeforeImportKey(
|
| + Status VerifyKeyUsagesBeforeImportKey(
|
| blink::WebCryptoKeyFormat format,
|
| blink::WebCryptoKeyUsageMask usage_mask) const override {
|
| switch (format) {
|
| @@ -106,11 +106,11 @@ class HmacImplementation : public AlgorithmImplementation {
|
| }
|
| }
|
|
|
| - virtual Status ImportKeyRaw(const CryptoData& key_data,
|
| - const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const override {
|
| + Status ImportKeyRaw(const CryptoData& key_data,
|
| + const blink::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usage_mask,
|
| + blink::WebCryptoKey* key) const override {
|
| const blink::WebCryptoAlgorithm& hash =
|
| algorithm.hmacImportParams()->hash();
|
|
|
| @@ -128,11 +128,11 @@ class HmacImplementation : public AlgorithmImplementation {
|
| key);
|
| }
|
|
|
| - virtual Status ImportKeyJwk(const CryptoData& key_data,
|
| - const blink::WebCryptoAlgorithm& algorithm,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usage_mask,
|
| - blink::WebCryptoKey* key) const override {
|
| + Status ImportKeyJwk(const CryptoData& key_data,
|
| + const blink::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usage_mask,
|
| + blink::WebCryptoKey* key) const override {
|
| const char* algorithm_name =
|
| GetJwkHmacAlgorithmName(algorithm.hmacImportParams()->hash().id());
|
| if (!algorithm_name)
|
| @@ -148,14 +148,14 @@ class HmacImplementation : public AlgorithmImplementation {
|
| CryptoData(raw_data), algorithm, extractable, usage_mask, key);
|
| }
|
|
|
| - virtual Status ExportKeyRaw(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const override {
|
| + Status ExportKeyRaw(const blink::WebCryptoKey& key,
|
| + std::vector<uint8_t>* buffer) const override {
|
| *buffer = SymKeyOpenSsl::Cast(key)->raw_key_data();
|
| return Status::Success();
|
| }
|
|
|
| - virtual Status ExportKeyJwk(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const override {
|
| + Status ExportKeyJwk(const blink::WebCryptoKey& key,
|
| + std::vector<uint8_t>* buffer) const override {
|
| SymKeyOpenSsl* sym_key = SymKeyOpenSsl::Cast(key);
|
| const std::vector<uint8_t>& raw_data = sym_key->raw_key_data();
|
|
|
| @@ -173,10 +173,10 @@ class HmacImplementation : public AlgorithmImplementation {
|
| return Status::Success();
|
| }
|
|
|
| - virtual Status Sign(const blink::WebCryptoAlgorithm& algorithm,
|
| - const blink::WebCryptoKey& key,
|
| - const CryptoData& data,
|
| - std::vector<uint8_t>* buffer) const override {
|
| + Status Sign(const blink::WebCryptoAlgorithm& algorithm,
|
| + const blink::WebCryptoKey& key,
|
| + const CryptoData& data,
|
| + std::vector<uint8_t>* buffer) const override {
|
| const blink::WebCryptoAlgorithm& hash =
|
| key.algorithm().hmacParams()->hash();
|
|
|
| @@ -184,11 +184,11 @@ class HmacImplementation : public AlgorithmImplementation {
|
| SymKeyOpenSsl::Cast(key)->raw_key_data(), hash, data, buffer);
|
| }
|
|
|
| - virtual Status Verify(const blink::WebCryptoAlgorithm& algorithm,
|
| - const blink::WebCryptoKey& key,
|
| - const CryptoData& signature,
|
| - const CryptoData& data,
|
| - bool* signature_match) const override {
|
| + Status Verify(const blink::WebCryptoAlgorithm& algorithm,
|
| + const blink::WebCryptoKey& key,
|
| + const CryptoData& signature,
|
| + const CryptoData& data,
|
| + bool* signature_match) const override {
|
| std::vector<uint8_t> result;
|
| Status status = Sign(algorithm, key, data, &result);
|
|
|
|
|