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

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

Issue 787123003: Refactor: Extract some duplicated code for verifying usages during import of asymmetric key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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/openssl/ec_key_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/nss/rsa_key_nss.cc
diff --git a/content/child/webcrypto/nss/rsa_key_nss.cc b/content/child/webcrypto/nss/rsa_key_nss.cc
index 7a35593c18bdd75b2bfd5d7cd6e29704aa5f069b..a92163d90c55d592debac5c3f38efb0b2d41bfac 100644
--- a/content/child/webcrypto/nss/rsa_key_nss.cc
+++ b/content/child/webcrypto/nss/rsa_key_nss.cc
@@ -588,23 +588,8 @@ Status RsaHashedAlgorithm::GenerateKey(
Status RsaHashedAlgorithm::VerifyKeyUsagesBeforeImportKey(
blink::WebCryptoKeyFormat format,
blink::WebCryptoKeyUsageMask usages) const {
- switch (format) {
- case blink::WebCryptoKeyFormatSpki:
- return CheckKeyCreationUsages(all_public_key_usages_, usages);
- case blink::WebCryptoKeyFormatPkcs8:
- return CheckKeyCreationUsages(all_private_key_usages_, usages);
- case blink::WebCryptoKeyFormatJwk:
- // The JWK could represent either a public key or private key. The usages
- // must make sense for one of the two. The usages will be checked again by
- // ImportKeyJwk() once the key type has been determined.
- if (CheckKeyCreationUsages(all_private_key_usages_, usages).IsSuccess() ||
- CheckKeyCreationUsages(all_public_key_usages_, usages).IsSuccess()) {
- return Status::Success();
- }
- return Status::ErrorCreateKeyBadUsages();
- default:
- return Status::ErrorUnsupportedImportKeyFormat();
- }
+ return VerifyUsagesBeforeImportAsymmetricKey(format, all_public_key_usages_,
+ all_private_key_usages_, usages);
}
Status RsaHashedAlgorithm::ImportKeyPkcs8(
« no previous file with comments | « no previous file | content/child/webcrypto/openssl/ec_key_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698