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

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

Issue 786363002: Refactor: Extract common code for generating asymmetric keys to a helper. (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/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..388a585ea5b2cef6608ccfdb14fd053eaacf5149 100644
--- a/content/child/webcrypto/nss/rsa_key_nss.cc
+++ b/content/child/webcrypto/nss/rsa_key_nss.cc
@@ -503,19 +503,15 @@ Status RsaHashedAlgorithm::GenerateKey(
bool extractable,
blink::WebCryptoKeyUsageMask combined_usages,
GenerateKeyResult* result) const {
- Status status = CheckKeyCreationUsages(
- all_public_key_usages_ | all_private_key_usages_, combined_usages);
+ blink::WebCryptoKeyUsageMask public_usages = 0;
+ blink::WebCryptoKeyUsageMask private_usages = 0;
+
+ Status status = GetUsagesForGenerateAsymmetricKey(
+ all_public_key_usages_, all_private_key_usages_, combined_usages,
+ &public_usages, &private_usages);
if (status.IsError())
return status;
- const blink::WebCryptoKeyUsageMask public_usages =
- combined_usages & all_public_key_usages_;
- const blink::WebCryptoKeyUsageMask private_usages =
- combined_usages & all_private_key_usages_;
-
- if (private_usages == 0)
- return Status::ErrorCreateKeyEmptyUsages();
-
unsigned int public_exponent = 0;
unsigned int modulus_length_bits = 0;
status = GetRsaKeyGenParameters(algorithm.rsaHashedKeyGenParams(),
« 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