Chromium Code Reviews| Index: net/ssl/openssl_client_key_store.cc |
| diff --git a/net/ssl/openssl_client_key_store.cc b/net/ssl/openssl_client_key_store.cc |
| index d7a32e8f2fa47b1ebcdd1db123afdf8b3c6c1435..ef38da6e12770ebc186d8488073b212923906d9e 100644 |
| --- a/net/ssl/openssl_client_key_store.cc |
| +++ b/net/ssl/openssl_client_key_store.cc |
| @@ -107,22 +107,20 @@ bool OpenSSLClientKeyStore::RecordClientCertPrivateKey( |
| return true; |
| } |
| -bool OpenSSLClientKeyStore::FetchClientCertPrivateKey( |
| - const X509Certificate* client_cert, |
| - crypto::ScopedEVP_PKEY* private_key) { |
| +crypto::ScopedEVP_PKEY OpenSSLClientKeyStore::FetchClientCertPrivateKey( |
| + const X509Certificate* client_cert) { |
| if (!client_cert) |
| - return false; |
| + return crypto::ScopedEVP_PKEY(); |
|
Ryan Sleevi
2014/07/24 19:13:02
Random comment: This code prevents NRVO, because i
davidben
2014/07/24 21:02:25
(Tangentially, I wish we could spell those lines r
|
| crypto::ScopedEVP_PKEY pub_key(GetOpenSSLPublicKey(client_cert)); |
| if (!pub_key.get()) |
| - return false; |
| + return crypto::ScopedEVP_PKEY(); |
| int index = FindKeyPairIndex(pub_key.get()); |
| if (index < 0) |
| - return false; |
| + return crypto::ScopedEVP_PKEY(); |
| - private_key->reset(CopyEVP_PKEY(pairs_[index].private_key)); |
| - return true; |
| + return crypto::ScopedEVP_PKEY(CopyEVP_PKEY(pairs_[index].private_key)); |
| } |
| void OpenSSLClientKeyStore::Flush() { |