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

Unified Diff: content/child/webcrypto/openssl/util_openssl.cc

Issue 948543002: Convert crypto::ScopedOpenSSL to type aliases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/child/webcrypto/openssl/aes_ctr_openssl.cc ('k') | crypto/ec_private_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/util_openssl.cc
diff --git a/content/child/webcrypto/openssl/util_openssl.cc b/content/child/webcrypto/openssl/util_openssl.cc
index f60fb3cbb658ad062568949a697895a6700dcbc1..b03c632068e750e7a77cd94d5325382b8fe5964c 100644
--- a/content/child/webcrypto/openssl/util_openssl.cc
+++ b/content/child/webcrypto/openssl/util_openssl.cc
@@ -101,8 +101,7 @@ Status AeadEncryptDecrypt(EncryptOrDecrypt mode,
return Status::OperationError();
}
- crypto::ScopedOpenSSL<EVP_AEAD_CTX, EVP_AEAD_CTX_cleanup>::Type ctx_cleanup(
- &ctx);
+ crypto::ScopedOpenSSL<EVP_AEAD_CTX, EVP_AEAD_CTX_cleanup> ctx_cleanup(&ctx);
size_t len;
int ok;
@@ -226,8 +225,8 @@ Status ImportUnverifiedPkeyFromPkcs8(const CryptoData& key_data,
crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
const uint8_t* ptr = key_data.bytes();
- crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>::Type
- p8inf(d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, key_data.byte_length()));
+ crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> p8inf(
+ d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, key_data.byte_length()));
if (!p8inf.get() || ptr != key_data.bytes() + key_data.byte_length())
return Status::DataError();
« no previous file with comments | « content/child/webcrypto/openssl/aes_ctr_openssl.cc ('k') | crypto/ec_private_key_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698