OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" | 5 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" |
6 | 6 |
7 #include "base/android/jni_array.h" | 7 #include "base/android/jni_array.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/android/scoped_java_ref.h" | 9 #include "base/android/scoped_java_ref.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/callback_helpers.h" | 11 #include "base/callback_helpers.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 14 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
15 #include "content/public/browser/browser_thread.h" | 15 #include "content/public/browser/browser_thread.h" |
16 #include "jni/SSLClientCertificateRequest_jni.h" | 16 #include "jni/SSLClientCertificateRequest_jni.h" |
17 #include "net/android/keystore_openssl.h" | 17 #include "net/android/keystore_openssl.h" |
18 #include "net/base/host_port_pair.h" | 18 #include "net/base/host_port_pair.h" |
19 #include "net/base/openssl_client_key_store.h" | 19 #include "net/base/openssl_client_key_store.h" |
20 #include "net/base/ssl_cert_request_info.h" | |
21 #include "net/base/ssl_client_cert_type.h" | |
22 #include "net/base/x509_certificate.h" | 20 #include "net/base/x509_certificate.h" |
| 21 #include "net/ssl/ssl_cert_request_info.h" |
| 22 #include "net/ssl/ssl_client_cert_type.h" |
23 | 23 |
24 namespace chrome { | 24 namespace chrome { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 typedef net::OpenSSLClientKeyStore::ScopedEVP_PKEY ScopedEVP_PKEY; | 28 typedef net::OpenSSLClientKeyStore::ScopedEVP_PKEY ScopedEVP_PKEY; |
29 | 29 |
30 // Must be called on the I/O thread to record a client certificate | 30 // Must be called on the I/O thread to record a client certificate |
31 // and its private key in the OpenSSLClientKeyStore. | 31 // and its private key in the OpenSSLClientKeyStore. |
32 void RecordClientCertificateKey( | 32 void RecordClientCertificateKey( |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 void ShowSSLClientCertificateSelector( | 210 void ShowSSLClientCertificateSelector( |
211 content::WebContents* contents, | 211 content::WebContents* contents, |
212 const net::HttpNetworkSession* network_session, | 212 const net::HttpNetworkSession* network_session, |
213 net::SSLCertRequestInfo* cert_request_info, | 213 net::SSLCertRequestInfo* cert_request_info, |
214 const chrome::SelectCertificateCallback& callback) { | 214 const chrome::SelectCertificateCallback& callback) { |
215 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 215 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
216 StartClientCertificateRequest(cert_request_info, callback); | 216 StartClientCertificateRequest(cert_request_info, callback); |
217 } | 217 } |
218 | 218 |
219 } // namespace chrome | 219 } // namespace chrome |
OLD | NEW |