Plumbing SSLPrivateKey

net/ssl/ssl_platform_key_nss.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_platform_key.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <prerror.h>
 
 #include <openssl/bn.h>
 #include <openssl/ecdsa.h>
 #include <openssl/rsa.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "crypto/scoped_nss_types.h"
 #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"
 
 namespace net {
 
 namespace {
 
 void LogPRError() {
   PRErrorCode err = PR_GetError();
   const char* err_name = PR_ErrorToName(err);
@@ skipping 114 matching lines @@
 
  private:
   SSLPrivateKey::Type type_;
   crypto::ScopedSECKEYPrivateKey key_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyNSS);
 };
 
 }  // namespace
 
-scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(
-    X509Certificate* certificate,
-    scoped_refptr<base::SequencedTaskRunner> task_runner) {
+scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
+    X509Certificate* certificate) {
+  if (!certificate || !certificate->os_cert_handle()) {
+    return nullptr;
+  }
+
   crypto::ScopedSECKEYPrivateKey key(
       PK11_FindKeyByAnyCert(certificate->os_cert_handle(), nullptr));
   if (!key) {
     return ClientKeyStore::GetInstance()->FetchClientCertPrivateKey(
         *certificate);
   }
 
   KeyType nss_type = SECKEY_GetPrivateKeyType(key.get());
   SSLPrivateKey::Type type;
   switch (nss_type) {
     case rsaKey:
       type = SSLPrivateKey::Type::RSA;
       break;
     case ecKey:
       type = SSLPrivateKey::Type::ECDSA;
       break;
     default:
       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