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

Unified Diff: content/renderer/webcrypto/platform_crypto_openssl.cc

Issue 171503006: [style] Run webcrypto files through clang-format. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 months 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/renderer/webcrypto/platform_crypto_nss.cc ('k') | content/renderer/webcrypto/shared_crypto.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webcrypto/platform_crypto_openssl.cc
diff --git a/content/renderer/webcrypto/platform_crypto_openssl.cc b/content/renderer/webcrypto/platform_crypto_openssl.cc
index 0669674d535024a97c59c2cec2141fc91c4287e2..45ba541541a2dec7b6cc7e36bcdadd49ec17afaf 100644
--- a/content/renderer/webcrypto/platform_crypto_openssl.cc
+++ b/content/renderer/webcrypto/platform_crypto_openssl.cc
@@ -59,10 +59,7 @@ const EVP_CIPHER* GetAESCipherByKeyLength(unsigned int key_length_bytes) {
}
// OpenSSL constants for EVP_CipherInit_ex(), do not change
-enum CipherOperation {
- kDoDecrypt = 0,
- kDoEncrypt = 1
-};
+enum CipherOperation { kDoDecrypt = 0, kDoEncrypt = 1 };
Status AesCbcEncryptDecrypt(EncryptOrDecrypt mode,
SymKey* key,
@@ -142,9 +139,7 @@ Status ExportKeyRaw(SymKey* key, blink::WebArrayBuffer* buffer) {
return Status::Success();
}
-void Init() {
- crypto::EnsureOpenSSLInit();
-}
+void Init() { crypto::EnsureOpenSSLInit(); }
Status EncryptDecryptAesCbc(EncryptOrDecrypt mode,
SymKey* key,
@@ -189,7 +184,7 @@ Status DigestSha(blink::WebCryptoAlgorithmId algorithm,
if (!EVP_DigestInit_ex(digest_context.get(), digest_algorithm, NULL) ||
!EVP_DigestUpdate(
- digest_context.get(), data.bytes(), data.byte_length())) {
+ digest_context.get(), data.bytes(), data.byte_length())) {
return Status::Error();
}
@@ -212,12 +207,11 @@ Status DigestSha(blink::WebCryptoAlgorithmId algorithm,
return Status::Success();
}
-Status GenerateSecretKey(
- const blink::WebCryptoAlgorithm& algorithm,
- bool extractable,
- blink::WebCryptoKeyUsageMask usage_mask,
- unsigned keylen_bytes,
- blink::WebCryptoKey* key) {
+Status GenerateSecretKey(const blink::WebCryptoAlgorithm& algorithm,
+ bool extractable,
+ blink::WebCryptoKeyUsageMask usage_mask,
+ unsigned keylen_bytes,
+ blink::WebCryptoKey* key) {
// TODO(eroman): Is this right?
if (keylen_bytes == 0)
return Status::ErrorGenerateKeyLength();
@@ -237,12 +231,11 @@ Status GenerateSecretKey(
return Status::Success();
}
-Status GenerateRsaKeyPair(
- const blink::WebCryptoAlgorithm& algorithm,
- bool extractable,
- blink::WebCryptoKeyUsageMask usage_mask,
- blink::WebCryptoKey* public_key,
- blink::WebCryptoKey* private_key) {
+Status GenerateRsaKeyPair(const blink::WebCryptoAlgorithm& algorithm,
+ bool extractable,
+ blink::WebCryptoKeyUsageMask usage_mask,
+ blink::WebCryptoKey* public_key,
+ blink::WebCryptoKey* private_key) {
// TODO(padolph): Placeholder for OpenSSL implementation.
// Issue http://crbug.com/267888.
return Status::ErrorUnsupported();
@@ -268,63 +261,61 @@ Status SignHmac(SymKey* key,
blink::WebArrayBuffer* buffer) {
blink::WebArrayBuffer result;
- // TODO(eroman): De-indent this code.
- const EVP_MD* evp_sha = 0;
- unsigned int hmac_expected_length = 0;
- // Note that HMAC length is determined by the hash used.
- switch (hash.id()) {
- case blink::WebCryptoAlgorithmIdSha1:
- evp_sha = EVP_sha1();
- hmac_expected_length = SHA_DIGEST_LENGTH;
- break;
- case blink::WebCryptoAlgorithmIdSha224:
- evp_sha = EVP_sha224();
- hmac_expected_length = SHA224_DIGEST_LENGTH;
- break;
- case blink::WebCryptoAlgorithmIdSha256:
- evp_sha = EVP_sha256();
- hmac_expected_length = SHA256_DIGEST_LENGTH;
- break;
- case blink::WebCryptoAlgorithmIdSha384:
- evp_sha = EVP_sha384();
- hmac_expected_length = SHA384_DIGEST_LENGTH;
- break;
- case blink::WebCryptoAlgorithmIdSha512:
- evp_sha = EVP_sha512();
- hmac_expected_length = SHA512_DIGEST_LENGTH;
- break;
- default:
- // Not a digest algorithm.
- return Status::ErrorUnsupported();
- }
-
- const std::vector<unsigned char>& raw_key = key->key();
-
- // OpenSSL wierdness here.
- // First, HMAC() needs a void* for the key data, so make one up front as a
- // cosmetic to avoid a cast. Second, OpenSSL does not like a NULL key,
- // which will result if the raw_key vector is empty; an entirely valid
- // case. Handle this specific case by pointing to an empty array.
- const unsigned char null_key[] = {};
- const void* const raw_key_voidp = raw_key.size() ? &raw_key[0] : null_key;
-
- result = blink::WebArrayBuffer::create(hmac_expected_length, 1);
- crypto::ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> hmac_result(
- reinterpret_cast<unsigned char*>(result.data()),
- hmac_expected_length);
-
- crypto::OpenSSLErrStackTracer(FROM_HERE);
-
- unsigned int hmac_actual_length;
- unsigned char* const success = HMAC(evp_sha,
- raw_key_voidp,
- raw_key.size(),
- data.bytes(),
- data.byte_length(),
- hmac_result.safe_buffer(),
- &hmac_actual_length);
- if (!success || hmac_actual_length != hmac_expected_length)
- return Status::Error();
+ const EVP_MD* evp_sha = 0;
+ unsigned int hmac_expected_length = 0;
+ // Note that HMAC length is determined by the hash used.
+ switch (hash.id()) {
+ case blink::WebCryptoAlgorithmIdSha1:
+ evp_sha = EVP_sha1();
+ hmac_expected_length = SHA_DIGEST_LENGTH;
+ break;
+ case blink::WebCryptoAlgorithmIdSha224:
+ evp_sha = EVP_sha224();
+ hmac_expected_length = SHA224_DIGEST_LENGTH;
+ break;
+ case blink::WebCryptoAlgorithmIdSha256:
+ evp_sha = EVP_sha256();
+ hmac_expected_length = SHA256_DIGEST_LENGTH;
+ break;
+ case blink::WebCryptoAlgorithmIdSha384:
+ evp_sha = EVP_sha384();
+ hmac_expected_length = SHA384_DIGEST_LENGTH;
+ break;
+ case blink::WebCryptoAlgorithmIdSha512:
+ evp_sha = EVP_sha512();
+ hmac_expected_length = SHA512_DIGEST_LENGTH;
+ break;
+ default:
+ // Not a digest algorithm.
+ return Status::ErrorUnsupported();
+ }
+
+ const std::vector<unsigned char>& raw_key = key->key();
+
+ // OpenSSL wierdness here.
+ // First, HMAC() needs a void* for the key data, so make one up front as a
+ // cosmetic to avoid a cast. Second, OpenSSL does not like a NULL key,
+ // which will result if the raw_key vector is empty; an entirely valid
+ // case. Handle this specific case by pointing to an empty array.
+ const unsigned char null_key[] = {};
+ const void* const raw_key_voidp = raw_key.size() ? &raw_key[0] : null_key;
+
+ result = blink::WebArrayBuffer::create(hmac_expected_length, 1);
+ crypto::ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> hmac_result(
+ reinterpret_cast<unsigned char*>(result.data()), hmac_expected_length);
+
+ crypto::OpenSSLErrStackTracer(FROM_HERE);
+
+ unsigned int hmac_actual_length;
+ unsigned char* const success = HMAC(evp_sha,
+ raw_key_voidp,
+ raw_key.size(),
+ data.bytes(),
+ data.byte_length(),
+ hmac_result.safe_buffer(),
+ &hmac_actual_length);
+ if (!success || hmac_actual_length != hmac_expected_length)
+ return Status::Error();
*buffer = result;
return Status::Success();
« no previous file with comments | « content/renderer/webcrypto/platform_crypto_nss.cc ('k') | content/renderer/webcrypto/shared_crypto.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698