Plumbing SSLPrivateKey

net/ssl/ssl_platform_key_android.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 <openssl/digest.h>
 #include <openssl/evp.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/base/net_errors.h"
-#include "net/ssl/openssl_client_key_store.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/threaded_ssl_private_key.h"
 
 namespace net {
 
 namespace {
 
+base::LazyInstance<SSLPlatformKeyTaskRunner>::Leaky g_platform_key_task_runner =
+    LAZY_INSTANCE_INITIALIZER;
+
 class SSLPlatformKeyAndroid : public ThreadedSSLPrivateKey::Delegate {
  public:
   SSLPlatformKeyAndroid(crypto::ScopedEVP_PKEY key, SSLPrivateKey::Type type)
       : key_(key.Pass()), type_(type) {}
 
   ~SSLPlatformKeyAndroid() override {}
 
   SSLPrivateKey::Type GetType() override { return type_; }
 
   bool SupportsHash(SSLPrivateKey::Hash hash) override { return true; }
@@ skipping 61 matching lines @@
 
  private:
   crypto::ScopedEVP_PKEY key_;
   SSLPrivateKey::Type type_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyAndroid);
 };
 
 }  // namespace
 
-scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(
-    X509Certificate* certificate,
-    scoped_refptr<base::SequencedTaskRunner> task_runner) {
-  crypto::ScopedEVP_PKEY key =
-      OpenSSLClientKeyStore::GetInstance()->FetchClientCertPrivateKey(
-          certificate);
+scoped_refptr<SSLPrivateKey> WrapPrivateKey(crypto::ScopedEVP_PKEY key) {
   if (!key)
     return nullptr;
 
   SSLPrivateKey::Type type;
   switch (EVP_PKEY_id(key.get())) {
     case EVP_PKEY_RSA:
       type = SSLPrivateKey::Type::RSA;
       break;
     case EVP_PKEY_EC:
       type = SSLPrivateKey::Type::ECDSA;
       break;
     default:
       LOG(ERROR) << "Unknown key type: " << EVP_PKEY_id(key.get());
       return nullptr;
   }
-  return make_scoped_ptr(new ThreadedSSLPrivateKey(
+  return make_scoped_refptr(new ThreadedSSLPrivateKey(
       make_scoped_ptr(new SSLPlatformKeyAndroid(key.Pass(), type)),
-      task_runner.Pass()));
+      g_platform_key_task_runner.Get().task_runner().Pass()));
 }
 
 }  // namespace net