Plumbing SSLPrivateKey

content/browser/ssl/ssl_client_auth_handler.cc

 // Copyright (c) 2012 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 "content/browser/ssl/ssl_client_auth_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   ~ClientCertificateDelegateImpl() override {
     if (!continue_called_) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&SSLClientAuthHandler::CancelCertificateSelection,
                      handler_));
     }
   }
 
   // ClientCertificateDelegate implementation:
-  void ContinueWithCertificate(net::X509Certificate* cert) override {
+  void ContinueWithCertificate(net::X509Certificate* cert,
+                               net::SSLPrivateKey* private_key) override {
     DCHECK(!continue_called_);
     continue_called_ = true;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientAuthHandler::ContinueWithCertificate, handler_,
-                   make_scoped_refptr(cert)));
+                   make_scoped_refptr(cert), make_scoped_refptr(private_key)));
   }
 
  private:
   base::WeakPtr<SSLClientAuthHandler> handler_;
   bool continue_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientCertificateDelegateImpl);
 };
 
 void SelectCertificateOnUIThread(
@@ skipping 82 matching lines @@
 void SSLClientAuthHandler::SelectCertificate() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // |core_| will call DidGetClientCerts when done.
   core_->GetClientCerts();
 }
 
 // static
 void SSLClientAuthHandler::ContinueWithCertificate(
     const base::WeakPtr<SSLClientAuthHandler>& handler,
-    net::X509Certificate* cert) {
+    net::X509Certificate* cert,
+    net::SSLPrivateKey* private_key) {
   if (handler)
-    handler->delegate_->ContinueWithCertificate(cert);
+    handler->delegate_->ContinueWithCertificate(cert, private_key);
 }
 
 // static
 void SSLClientAuthHandler::CancelCertificateSelection(
     const base::WeakPtr<SSLClientAuthHandler>& handler) {
   if (handler)
     handler->delegate_->CancelCertificateSelection();
 }
 
 void SSLClientAuthHandler::DidGetClientCerts() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Note that if |client_cert_store_| is NULL, we intentionally fall through to
   // SelectCertificateOnUIThread. This is for platforms where the client cert
   // matching is not performed by Chrome. Those platforms handle the cert
   // matching before showing the dialog.
   if (core_->has_client_cert_store() &&
       cert_request_info_->client_certs.empty()) {
     // No need to query the user if there are no certs to choose from.
     //
     // TODO(davidben): The WebContents-less check on the UI thread should come
     // before checking ClientCertStore; ClientCertStore itself should probably
     // be handled by the embedder (https://crbug.com/394131), especially since
     // this doesn't work on Android (https://crbug.com/345641).
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientAuthHandler::ContinueWithCertificate,
                    weak_factory_.GetWeakPtr(),
-                   scoped_refptr<net::X509Certificate>()));
+                   scoped_refptr<net::X509Certificate>(),
+                   scoped_refptr<net::SSLPrivateKey>()));
     return;
   }
 
   int render_process_host_id;
   int render_frame_host_id;
   if (!ResourceRequestInfo::ForRequest(request_)->GetAssociatedRenderFrame(
           &render_process_host_id, &render_frame_host_id)) {
     NOTREACHED();
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientAuthHandler::CancelCertificateSelection,
                    weak_factory_.GetWeakPtr()));
     return;
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SelectCertificateOnUIThread, render_process_host_id,
                  render_frame_host_id, cert_request_info_,
                  weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace content