diff options
-rw-r--r-- | crypto/ec_private_key_openssl.cc | 2 | ||||
-rw-r--r-- | crypto/rsa_private_key_openssl.cc | 2 | ||||
-rw-r--r-- | net/base/openssl_private_key_store_memory.cc | 2 | ||||
-rw-r--r-- | net/ssl/openssl_client_key_store.cc | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/crypto/ec_private_key_openssl.cc b/crypto/ec_private_key_openssl.cc index 45657a7..35403f3 100644 --- a/crypto/ec_private_key_openssl.cc +++ b/crypto/ec_private_key_openssl.cc @@ -88,7 +88,7 @@ ECPrivateKey::~ECPrivateKey() { ECPrivateKey* ECPrivateKey::Copy() const { scoped_ptr<ECPrivateKey> copy(new ECPrivateKey); if (key_) - copy->key_ = EVP_PKEY_dup(key_); + copy->key_ = EVP_PKEY_up_ref(key_); return copy.release(); } diff --git a/crypto/rsa_private_key_openssl.cc b/crypto/rsa_private_key_openssl.cc index 9f8352d..52a0a7a 100644 --- a/crypto/rsa_private_key_openssl.cc +++ b/crypto/rsa_private_key_openssl.cc @@ -103,7 +103,7 @@ RSAPrivateKey* RSAPrivateKey::CreateFromKey(EVP_PKEY* key) { if (EVP_PKEY_type(key->type) != EVP_PKEY_RSA) return NULL; RSAPrivateKey* copy = new RSAPrivateKey(); - copy->key_ = EVP_PKEY_dup(key); + copy->key_ = EVP_PKEY_up_ref(key); return copy; } diff --git a/net/base/openssl_private_key_store_memory.cc b/net/base/openssl_private_key_store_memory.cc index 4d6a287..5f939d4 100644 --- a/net/base/openssl_private_key_store_memory.cc +++ b/net/base/openssl_private_key_store_memory.cc @@ -36,7 +36,7 @@ class MemoryKeyPairStore { } bool StoreKeyPair(EVP_PKEY* pkey) { - EVP_PKEY_dup(pkey); + EVP_PKEY_up_ref(pkey); base::AutoLock lock(lock_); keys_.push_back(pkey); return true; diff --git a/net/ssl/openssl_client_key_store.cc b/net/ssl/openssl_client_key_store.cc index de65cd9..0bc97be 100644 --- a/net/ssl/openssl_client_key_store.cc +++ b/net/ssl/openssl_client_key_store.cc @@ -37,18 +37,17 @@ OpenSSLClientKeyStore::OpenSSLClientKeyStore() { OpenSSLClientKeyStore::~OpenSSLClientKeyStore() { } -OpenSSLClientKeyStore::KeyPair::KeyPair(EVP_PKEY* pub_key, - EVP_PKEY* priv_key) - : public_key(EVP_PKEY_dup(pub_key)), - private_key(EVP_PKEY_dup(priv_key)) { +OpenSSLClientKeyStore::KeyPair::KeyPair(EVP_PKEY* pub_key, EVP_PKEY* priv_key) + : public_key(EVP_PKEY_up_ref(pub_key)), + private_key(EVP_PKEY_up_ref(priv_key)) { } OpenSSLClientKeyStore::KeyPair::~KeyPair() { } OpenSSLClientKeyStore::KeyPair::KeyPair(const KeyPair& other) - : public_key(EVP_PKEY_dup(other.public_key.get())), - private_key(EVP_PKEY_dup(other.private_key.get())) { + : public_key(EVP_PKEY_up_ref(other.public_key.get())), + private_key(EVP_PKEY_up_ref(other.private_key.get())) { } void OpenSSLClientKeyStore::KeyPair::operator=(KeyPair other) { @@ -109,7 +108,8 @@ crypto::ScopedEVP_PKEY OpenSSLClientKeyStore::FetchClientCertPrivateKey( if (index < 0) return crypto::ScopedEVP_PKEY(); - return crypto::ScopedEVP_PKEY(EVP_PKEY_dup(pairs_[index].private_key.get())); + return crypto::ScopedEVP_PKEY( + EVP_PKEY_up_ref(pairs_[index].private_key.get())); } void OpenSSLClientKeyStore::Flush() { |