Index: crypto/ec_private_key_openssl.cc |
diff --git a/crypto/ec_private_key_openssl.cc b/crypto/ec_private_key_openssl.cc |
index b7b6b486a2af8e790d5fc2911d8e563335aa9e06..beda29fe13b7a5966027f335855966de2e415ac7 100644 |
--- a/crypto/ec_private_key_openssl.cc |
+++ b/crypto/ec_private_key_openssl.cc |
@@ -12,6 +12,7 @@ |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
#include "crypto/openssl_util.h" |
+#include "crypto/scoped_openssl_types.h" |
namespace crypto { |
@@ -24,6 +25,10 @@ namespace { |
// style guide, hence the unusual parameter placement / types. |
typedef int (*ExportBioFunction)(BIO* bio, const void* key); |
+typedef ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>::Type |
+ ScopedPKCS8_PRIV_KEY_INFO; |
+typedef ScopedOpenSSL<X509_SIG, X509_SIG_free>::Type ScopedX509_SIG; |
+ |
// Helper to export |key| into |output| via the specified ExportBioFunction. |
bool ExportKeyWithBio(const void* key, |
ExportBioFunction export_fn, |
@@ -31,7 +36,7 @@ bool ExportKeyWithBio(const void* key, |
if (!key) |
return false; |
- ScopedOpenSSL<BIO, BIO_free_all> bio(BIO_new(BIO_s_mem())); |
+ ScopedBIO bio(BIO_new(BIO_s_mem())); |
if (!bio.get()) |
return false; |
@@ -87,8 +92,7 @@ bool ECPrivateKey::IsSupported() { return true; } |
ECPrivateKey* ECPrivateKey::Create() { |
OpenSSLErrStackTracer err_tracer(FROM_HERE); |
- ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key( |
- EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)); |
+ ScopedEC_KEY ec_key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)); |
if (!ec_key.get() || !EC_KEY_generate_key(ec_key.get())) |
return NULL; |
@@ -118,21 +122,17 @@ ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( |
const_cast<uint8*>(&encrypted_private_key_info[0])); |
int private_key_data_len = |
static_cast<int>(encrypted_private_key_info.size()); |
- ScopedOpenSSL<BIO, BIO_free_all> bio( |
- BIO_new_mem_buf(private_key_data, private_key_data_len)); |
+ ScopedBIO bio(BIO_new_mem_buf(private_key_data, private_key_data_len)); |
if (!bio.get()) |
return NULL; |
// Convert it, then decrypt it into a PKCS#8 object. |
- ScopedOpenSSL<X509_SIG, X509_SIG_free> p8_encrypted( |
- d2i_PKCS8_bio(bio.get(), NULL)); |
+ ScopedX509_SIG p8_encrypted(d2i_PKCS8_bio(bio.get(), NULL)); |
if (!p8_encrypted.get()) |
return NULL; |
- ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> p8_decrypted( |
- PKCS8_decrypt(p8_encrypted.get(), |
- password.c_str(), |
- static_cast<int>(password.size()))); |
+ ScopedPKCS8_PRIV_KEY_INFO p8_decrypted(PKCS8_decrypt( |
+ p8_encrypted.get(), password.c_str(), static_cast<int>(password.size()))); |
if (!p8_decrypted.get() && password.empty()) { |
// Hack for reading keys generated by ec_private_key_nss. Passing NULL |
// causes OpenSSL to use an empty password instead of "\0\0". |
@@ -156,8 +156,7 @@ bool ECPrivateKey::ExportEncryptedPrivateKey( |
std::vector<uint8>* output) { |
OpenSSLErrStackTracer err_tracer(FROM_HERE); |
// Convert into a PKCS#8 object. |
- ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> pkcs8( |
- EVP_PKEY2PKCS8(key_)); |
+ ScopedPKCS8_PRIV_KEY_INFO pkcs8(EVP_PKEY2PKCS8(key_)); |
if (!pkcs8.get()) |
return false; |
@@ -165,15 +164,14 @@ bool ECPrivateKey::ExportEncryptedPrivateKey( |
// NOTE: NSS uses SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC |
// so use NID_pbe_WithSHA1And3_Key_TripleDES_CBC which should be the OpenSSL |
// equivalent. |
- ScopedOpenSSL<X509_SIG, X509_SIG_free> encrypted( |
- PKCS8_encrypt(NID_pbe_WithSHA1And3_Key_TripleDES_CBC, |
- NULL, |
- password.c_str(), |
- static_cast<int>(password.size()), |
- NULL, |
- 0, |
- iterations, |
- pkcs8.get())); |
+ ScopedX509_SIG encrypted(PKCS8_encrypt(NID_pbe_WithSHA1And3_Key_TripleDES_CBC, |
+ NULL, |
+ password.c_str(), |
+ static_cast<int>(password.size()), |
+ NULL, |
+ 0, |
+ iterations, |
+ pkcs8.get())); |
if (!encrypted.get()) |
return false; |
@@ -211,7 +209,7 @@ bool ECPrivateKey::ExportRawPublicKey(std::string* output) { |
bool ECPrivateKey::ExportValue(std::vector<uint8>* output) { |
OpenSSLErrStackTracer err_tracer(FROM_HERE); |
- ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_)); |
+ ScopedEC_KEY ec_key(EVP_PKEY_get1_EC_KEY(key_)); |
return ExportKey(ec_key.get(), |
reinterpret_cast<ExportDataFunction>(i2d_ECPrivateKey), |
output); |
@@ -219,7 +217,7 @@ bool ECPrivateKey::ExportValue(std::vector<uint8>* output) { |
bool ECPrivateKey::ExportECParams(std::vector<uint8>* output) { |
OpenSSLErrStackTracer err_tracer(FROM_HERE); |
- ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_)); |
+ ScopedEC_KEY ec_key(EVP_PKEY_get1_EC_KEY(key_)); |
return ExportKey(ec_key.get(), |
reinterpret_cast<ExportDataFunction>(i2d_ECParameters), |
output); |