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

Unified Diff: content/child/webcrypto/openssl/ec_key_openssl.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 | « content/child/webcrypto/nss/rsa_key_nss.cc ('k') | content/child/webcrypto/openssl/rsa_key_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webcrypto/openssl/ec_key_openssl.cc
diff --git a/content/child/webcrypto/openssl/ec_key_openssl.cc b/content/child/webcrypto/openssl/ec_key_openssl.cc
index 81e233701f42767301e104023301db12f4942f6f..a04be160c7c8d941fa2d06acf8c8955281b913cb 100644
--- a/content/child/webcrypto/openssl/ec_key_openssl.cc
+++ b/content/child/webcrypto/openssl/ec_key_openssl.cc
@@ -208,19 +208,15 @@ Status EcAlgorithm::GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
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();
-
const blink::WebCryptoEcKeyGenParams* params = algorithm.ecKeyGenParams();
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
« no previous file with comments | « content/child/webcrypto/nss/rsa_key_nss.cc ('k') | content/child/webcrypto/openssl/rsa_key_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698