Plumbing SSLPrivateKey

net/ssl/ssl_platform_key_win.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 <windows.h>
 #include <NCrypt.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include <openssl/bn.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-#include "base/lazy_instance.h"

[davidben, 2015/10/13 20:32:16]

Still needed for this file.

[svaldez, 2015/10/14 15:06:19]

Done.

 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/win/windows_version.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_capi_types.h"
 #include "crypto/wincrypt_shim.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/scoped_openssl_types.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 {
 
 using NCryptFreeObjectFunc = SECURITY_STATUS(WINAPI*)(NCRYPT_HANDLE);
 using NCryptSignHashFunc = SECURITY_STATUS(WINAPI*)(NCRYPT_KEY_HANDLE,  // hKey
                                                     VOID*,   // pPaddingInfo
@@ skipping 269 matching lines @@
       break;
     default:
       return false;
   }
   *out_max_length = EVP_PKEY_size(key.get());
   return true;
 }
 
 }  // namespace
 
-scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(
-    X509Certificate* certificate,
-    scoped_refptr<base::SequencedTaskRunner> task_runner) {
+scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
+    X509Certificate* certificate) {
+  if (!certificate) {
+    return nullptr;
+  }
+
   // Rather than query the private key for metadata, extract the public key from
   // the certificate without using Windows APIs. CAPI and CNG do not
   // consistently work depending on the system. See https://crbug.com/468345.
   SSLPrivateKey::Type key_type;
   size_t max_length;
   if (!GetKeyInfo(certificate, &key_type, &max_length))
     return nullptr;
 
   PCCERT_CONTEXT cert_context = certificate->os_cert_handle();
 
@@ skipping 14 matching lines @@
   // transferred.
   CHECK_EQ(must_free, TRUE);
 
   scoped_ptr<ThreadedSSLPrivateKey::Delegate> delegate;
   if (key_spec == CERT_NCRYPT_KEY_SPEC) {
     delegate.reset(new SSLPlatformKeyCNG(prov_or_key, key_type, max_length));
   } else {
     DCHECK(SSLPrivateKey::Type::RSA == key_type);
     delegate.reset(new SSLPlatformKeyCAPI(prov_or_key, key_spec, max_length));
   }
-  return make_scoped_ptr(
-      new ThreadedSSLPrivateKey(delegate.Pass(), task_runner.Pass()));
+  return make_scoped_refptr(new ThreadedSSLPrivateKey(
+      delegate.Pass(), GetSSLPlatformKeyTaskRunner()));
 }
 
 }  // namespace net