| Index: components/webcrypto/algorithms/aes.h
|
| diff --git a/components/webcrypto/algorithms/aes.h b/components/webcrypto/algorithms/aes.h
|
| index 65b82d74590f9931e18b6dfc1c7a60f7fda0072d..b7b0ad55961951198f45195dbad851f3c983fd58 100644
|
| --- a/components/webcrypto/algorithms/aes.h
|
| +++ b/components/webcrypto/algorithms/aes.h
|
| @@ -33,40 +33,47 @@ class AesAlgorithm : public AlgorithmImplementation {
|
| blink::WebCryptoKeyUsageMask usages,
|
| GenerateKeyResult* result) const override;
|
|
|
| - Status VerifyKeyUsagesBeforeImportKey(
|
| - blink::WebCryptoKeyFormat format,
|
| - blink::WebCryptoKeyUsageMask usages) const override;
|
| + Status ImportKey(blink::WebCryptoKeyFormat format,
|
| + const CryptoData& key_data,
|
| + const blink::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usages,
|
| + blink::WebCryptoKey* key) const override;
|
|
|
| + Status ExportKey(blink::WebCryptoKeyFormat format,
|
| + const blink::WebCryptoKey& key,
|
| + std::vector<uint8_t>* buffer) const override;
|
| +
|
| + Status DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,
|
| + blink::WebCryptoKeyType type,
|
| + bool extractable,
|
| + blink::WebCryptoKeyUsageMask usages,
|
| + const CryptoData& key_data,
|
| + blink::WebCryptoKey* key) const override;
|
| +
|
| + Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
|
| + bool* has_length_bits,
|
| + unsigned int* length_bits) const override;
|
| +
|
| + private:
|
| Status ImportKeyRaw(const CryptoData& key_data,
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usages,
|
| - blink::WebCryptoKey* key) const override;
|
| + blink::WebCryptoKey* key) const;
|
|
|
| Status ImportKeyJwk(const CryptoData& key_data,
|
| const blink::WebCryptoAlgorithm& algorithm,
|
| bool extractable,
|
| blink::WebCryptoKeyUsageMask usages,
|
| - blink::WebCryptoKey* key) const override;
|
| + blink::WebCryptoKey* key) const;
|
|
|
| Status ExportKeyRaw(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const override;
|
| + std::vector<uint8_t>* buffer) const;
|
|
|
| Status ExportKeyJwk(const blink::WebCryptoKey& key,
|
| - std::vector<uint8_t>* buffer) const override;
|
| + std::vector<uint8_t>* buffer) const;
|
|
|
| - Status DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm,
|
| - blink::WebCryptoKeyType type,
|
| - bool extractable,
|
| - blink::WebCryptoKeyUsageMask usages,
|
| - const CryptoData& key_data,
|
| - blink::WebCryptoKey* key) const override;
|
| -
|
| - Status GetKeyLength(const blink::WebCryptoAlgorithm& key_length_algorithm,
|
| - bool* has_length_bits,
|
| - unsigned int* length_bits) const override;
|
| -
|
| - private:
|
| const blink::WebCryptoKeyUsageMask all_key_usages_;
|
| const std::string jwk_suffix_;
|
| };
|
|
|