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

Side by Side Diff: net/base/openssl_private_key_store_memory.cc

Issue 1129083007: Replace EVP_PKEY_dup calls with EVP_PKEY_up_ref. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 unified diff | Download patch
« no previous file with comments | « crypto/rsa_private_key_openssl.cc ('k') | net/ssl/openssl_client_key_store.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Defines an in-memory private key store, primarily used for testing. 5 // Defines an in-memory private key store, primarily used for testing.
6 6
7 #include "net/base/openssl_private_key_store.h" 7 #include "net/base/openssl_private_key_store.h"
8 8
9 #include <openssl/evp.h> 9 #include <openssl/evp.h>
10 10
(...skipping 18 matching lines...) Expand all
29 29
30 ~MemoryKeyPairStore() { 30 ~MemoryKeyPairStore() {
31 base::AutoLock lock(lock_); 31 base::AutoLock lock(lock_);
32 for (std::vector<EVP_PKEY*>::iterator it = keys_.begin(); 32 for (std::vector<EVP_PKEY*>::iterator it = keys_.begin();
33 it != keys_.end(); ++it) { 33 it != keys_.end(); ++it) {
34 EVP_PKEY_free(*it); 34 EVP_PKEY_free(*it);
35 } 35 }
36 } 36 }
37 37
38 bool StoreKeyPair(EVP_PKEY* pkey) { 38 bool StoreKeyPair(EVP_PKEY* pkey) {
39 EVP_PKEY_dup(pkey); 39 EVP_PKEY_up_ref(pkey);
40 base::AutoLock lock(lock_); 40 base::AutoLock lock(lock_);
41 keys_.push_back(pkey); 41 keys_.push_back(pkey);
42 return true; 42 return true;
43 } 43 }
44 44
45 bool HasPrivateKey(EVP_PKEY* pkey) { 45 bool HasPrivateKey(EVP_PKEY* pkey) {
46 base::AutoLock lock(lock_); 46 base::AutoLock lock(lock_);
47 for (std::vector<EVP_PKEY*>::iterator it = keys_.begin(); 47 for (std::vector<EVP_PKEY*>::iterator it = keys_.begin();
48 it != keys_.end(); ++it) { 48 it != keys_.end(); ++it) {
49 if (EVP_PKEY_cmp(*it, pkey) == 1) 49 if (EVP_PKEY_cmp(*it, pkey) == 1)
(...skipping 15 matching lines...) Expand all
65 EVP_PKEY* pkey) { 65 EVP_PKEY* pkey) {
66 return MemoryKeyPairStore::GetInstance()->StoreKeyPair(pkey); 66 return MemoryKeyPairStore::GetInstance()->StoreKeyPair(pkey);
67 } 67 }
68 68
69 bool OpenSSLPrivateKeyStore::HasPrivateKey(EVP_PKEY* pub_key) { 69 bool OpenSSLPrivateKeyStore::HasPrivateKey(EVP_PKEY* pub_key) {
70 return MemoryKeyPairStore::GetInstance()->HasPrivateKey(pub_key); 70 return MemoryKeyPairStore::GetInstance()->HasPrivateKey(pub_key);
71 } 71 }
72 72
73 } // namespace net 73 } // namespace net
74 74
OLDNEW
« no previous file with comments | « crypto/rsa_private_key_openssl.cc ('k') | net/ssl/openssl_client_key_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698