diff options
| author | svaldez <svaldez@chromium.org> | 2015-11-19 13:10:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 21:12:22 +0000 |
| commit | 7872fd0f67dc86e4de8eb34124e83364d3e20f62 (patch) | |
| tree | 3819bdbf6e9ef8a353a377c61a1beaf4ac84e0ab /net/ssl/ssl_platform_key_nss.cc | |
| parent | a75b0b292f95229b6a54bb3bb127eaa985c46689 (diff) | |
| download | chromium_src-7872fd0f67dc86e4de8eb34124e83364d3e20f62.zip chromium_src-7872fd0f67dc86e4de8eb34124e83364d3e20f62.tar.gz chromium_src-7872fd0f67dc86e4de8eb34124e83364d3e20f62.tar.bz2 | |
Plumbing SSLPrivateKey (//net)
Plumbing SSLPrivateKey out of URLRequest to allow better unit testing.
BUG=394131
Review URL: https://codereview.chromium.org/1422573008
Cr-Commit-Position: refs/heads/master@{#360663}
Diffstat (limited to 'net/ssl/ssl_platform_key_nss.cc')
| -rw-r--r-- | net/ssl/ssl_platform_key_nss.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ssl/ssl_platform_key_nss.cc b/net/ssl/ssl_platform_key_nss.cc index 2533210..f620ea9 100644 --- a/net/ssl/ssl_platform_key_nss.cc +++ b/net/ssl/ssl_platform_key_nss.cc @@ -20,6 +20,7 @@ #include "crypto/scoped_openssl_types.h" #include "net/cert/x509_certificate.h" #include "net/ssl/client_key_store.h" +#include "net/ssl/ssl_platform_key_task_runner.h" #include "net/ssl/ssl_private_key.h" #include "net/ssl/threaded_ssl_private_key.h" @@ -160,9 +161,8 @@ class SSLPlatformKeyNSS : public ThreadedSSLPrivateKey::Delegate { } // namespace -scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey( - X509Certificate* certificate, - scoped_refptr<base::SequencedTaskRunner> task_runner) { +scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey( + X509Certificate* certificate) { crypto::ScopedSECKEYPrivateKey key( PK11_FindKeyByAnyCert(certificate->os_cert_handle(), nullptr)); if (!key) { @@ -183,9 +183,9 @@ scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey( LOG(ERROR) << "Unknown key type: " << nss_type; return nullptr; } - return make_scoped_ptr(new ThreadedSSLPrivateKey( + return make_scoped_refptr(new ThreadedSSLPrivateKey( make_scoped_ptr(new SSLPlatformKeyNSS(type, key.Pass())), - task_runner.Pass())); + GetSSLPlatformKeyTaskRunner())); } } // namespace net |