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 "android_webview/native/aw_contents_client_bridge.h" | 5 #include "android_webview/native/aw_contents_client_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "android_webview/common/devtools_instrumentation.h" | 9 #include "android_webview/common/devtools_instrumentation.h" |
10 #include "android_webview/native/aw_contents.h" | 10 #include "android_webview/native/aw_contents.h" |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 // Create the X509Certificate object from the encoded chain. | 236 // Create the X509Certificate object from the encoded chain. |
237 scoped_refptr<net::X509Certificate> client_cert( | 237 scoped_refptr<net::X509Certificate> client_cert( |
238 net::X509Certificate::CreateFromDERCertChain(encoded_chain)); | 238 net::X509Certificate::CreateFromDERCertChain(encoded_chain)); |
239 if (!client_cert.get()) { | 239 if (!client_cert.get()) { |
240 LOG(ERROR) << "Could not decode client certificate chain"; | 240 LOG(ERROR) << "Could not decode client certificate chain"; |
241 return; | 241 return; |
242 } | 242 } |
243 | 243 |
244 // Create an SSLPrivateKey wrapper for the private key JNI reference. | 244 // Create an SSLPrivateKey wrapper for the private key JNI reference. |
245 scoped_refptr<net::SSLPrivateKey> private_key = | 245 scoped_refptr<net::SSLPrivateKey> private_key = |
246 net::WrapJavaPrivateKey(private_key_ref); | 246 net::WrapJavaPrivateKey(client_cert.get(), private_key_ref); |
247 if (!private_key) { | 247 if (!private_key) { |
248 LOG(ERROR) << "Could not create OpenSSL wrapper for private key"; | 248 LOG(ERROR) << "Could not create OpenSSL wrapper for private key"; |
249 return; | 249 return; |
250 } | 250 } |
251 | 251 |
252 // Release the guard and |pending_client_cert_request_delegates_| references | 252 // Release the guard and |pending_client_cert_request_delegates_| references |
253 // to |delegate|. | 253 // to |delegate|. |
254 pending_client_cert_request_delegates_.Remove(request_id); | 254 pending_client_cert_request_delegates_.Remove(request_id); |
255 ignore_result(guard.Release()); | 255 ignore_result(guard.Release()); |
256 | 256 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 pending_client_cert_request_delegates_.Remove(request_id); | 405 pending_client_cert_request_delegates_.Remove(request_id); |
406 | 406 |
407 delete delegate; | 407 delete delegate; |
408 } | 408 } |
409 | 409 |
410 bool RegisterAwContentsClientBridge(JNIEnv* env) { | 410 bool RegisterAwContentsClientBridge(JNIEnv* env) { |
411 return RegisterNativesImpl(env); | 411 return RegisterNativesImpl(env); |
412 } | 412 } |
413 | 413 |
414 } // namespace android_webview | 414 } // namespace android_webview |
OLD | NEW |