Cherry pick PR #1896: Change ImportKeyAlgorithmParams hash to Algorit…

…hmIdentifier. (#1973) Refer to the original PR: #1896 b/213220683 Co-authored-by: aee <[email protected]>
youtube · Nov 29, 2023 · 9988a77 · 9988a77
1 parent 7ada8b1
commit 9988a77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cobalt/subtlecrypto/import_key_algorithm_params.idl b/cobalt/subtlecrypto/import_key_algorithm_params.idl
@@ -19,7 +19,7 @@
 
 dictionary ImportKeyAlgorithmParams : Algorithm {
   // The inner hash function to use.
-  DOMString hash;
+  AlgorithmIdentifier hash;
   // The length (in bits) of the key.
   unsigned long length;
 };
diff --git a/cobalt/subtlecrypto/subtle_crypto.cc b/cobalt/subtlecrypto/subtle_crypto.cc
@@ -382,7 +382,7 @@ PromiseWrappable SubtleCrypto::ImportKey(
         algorithm.AsType<ImportKeyAlgorithmParams>();
     // 29.6.2 Set hash to equal the hash member of normalizedAlgorithm.
     if (algo_params.has_hash()) {
-      cryptoKey->set_hash(algo_params.hash());
+      cryptoKey->set_hash(get_name_or_string(algo_params.hash()));
     }
   }
   // 12. Resolve promise with result.