Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1626)

Unified Diff: content/child/webcrypto/nss/aes_key_nss.cc

Issue 777403004: [WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/child/webcrypto/nss/hmac_nss.cc » ('j') | content/child/webcrypto/nss/hmac_nss.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/nss/aes_key_nss.cc
diff --git a/content/child/webcrypto/nss/aes_key_nss.cc b/content/child/webcrypto/nss/aes_key_nss.cc
index d6a7fd9cb514026bfdd5ae6fbc95daee87ca3ac4..b260b0e1eb524cfd1627f478016cca38800377e3 100644
--- a/content/child/webcrypto/nss/aes_key_nss.cc
+++ b/content/child/webcrypto/nss/aes_key_nss.cc
@@ -42,7 +42,7 @@ Status AesAlgorithm::GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
bool extractable,
blink::WebCryptoKeyUsageMask usages,
GenerateKeyResult* result) const {
- Status status = CheckKeyCreationUsages(all_key_usages_, usages);
+ Status status = CheckKeyCreationUsages(all_key_usages_, usages, false);
eroman 2014/12/09 21:04:46 This may as well just pass true, and then remove t
Habib Virji 2014/12/15 18:48:55 Done.
if (status.IsError())
return status;
@@ -62,7 +62,7 @@ Status AesAlgorithm::VerifyKeyUsagesBeforeImportKey(
switch (format) {
case blink::WebCryptoKeyFormatRaw:
case blink::WebCryptoKeyFormatJwk:
- return CheckKeyCreationUsages(all_key_usages_, usages);
+ return CheckKeyCreationUsages(all_key_usages_, usages, true);
default:
return Status::ErrorUnsupportedImportKeyFormat();
}
« no previous file with comments | « no previous file | content/child/webcrypto/nss/hmac_nss.cc » ('j') | content/child/webcrypto/nss/hmac_nss.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698