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

Unified Diff: content/child/webcrypto/openssl/rsa_key_openssl.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: 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
Index: content/child/webcrypto/openssl/rsa_key_openssl.cc
diff --git a/content/child/webcrypto/openssl/rsa_key_openssl.cc b/content/child/webcrypto/openssl/rsa_key_openssl.cc
index 09e277f261f71d910379228d3f4921c0faa2160f..f2ab78d5d8187df395d1eb3a25279e82584c0eb6 100644
--- a/content/child/webcrypto/openssl/rsa_key_openssl.cc
+++ b/content/child/webcrypto/openssl/rsa_key_openssl.cc
@@ -234,23 +234,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(

Powered by Google App Engine
This is Rietveld 408576698