Refactor client cert private key handling.

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_win.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_capi_types.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
-#include "net/ssl/ssl_platform_key.h"
 #include "net/ssl/ssl_platform_key_util.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/threaded_ssl_private_key.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/ecdsa.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 
 namespace net {
 
 namespace {
@@ skipping 224 matching lines @@
     NCryptFreeObject(key);
     return nullptr;
   }
 
   return make_scoped_refptr(new ThreadedSSLPrivateKey(
       base::MakeUnique<SSLPlatformKeyCNG>(key, key_type, max_length),
       GetSSLPlatformKeyTaskRunner()));
 }
 
 scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
-    const X509Certificate* certificate) {
-  PCCERT_CONTEXT cert_context = certificate->os_cert_handle();
-
+    const X509Certificate* certificate,
+    PCCERT_CONTEXT cert_context) {
   HCRYPTPROV_OR_NCRYPT_KEY_HANDLE prov_or_key = 0;
   DWORD key_spec = 0;
   BOOL must_free = FALSE;
   DWORD flags = CRYPT_ACQUIRE_PREFER_NCRYPT_KEY_FLAG;
 
   if (!CryptAcquireCertificatePrivateKey(cert_context, flags, nullptr,
                                          &prov_or_key, &key_spec, &must_free)) {
     PLOG(WARNING) << "Could not acquire private key";
     return nullptr;
   }
 
   // Should never get a cached handle back - ownership must always be
   // transferred.
   CHECK_EQ(must_free, TRUE);
 
   if (key_spec == CERT_NCRYPT_KEY_SPEC) {
     return WrapCNGPrivateKey(certificate, prov_or_key);
   } else {
     return WrapCAPIPrivateKey(certificate, prov_or_key, key_spec);
   }
 }
 
 }  // namespace net