Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: android_webview/native/aw_contents_client_bridge.cc

Issue 1640833002: Android SSLPrivateKey Work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/android/ssl_client_certificate_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 60aea5b347797025b7a7a76522c70b5039c8b7d0..065d76e95e4821dd23323c1c1ac06a6c04352015 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -22,7 +22,7 @@
#include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_client_cert_type.h"
-#include "net/ssl/ssl_platform_key.h"
+#include "net/ssl/ssl_platform_key_android.h"
#include "net/ssl/ssl_private_key.h"
#include "url/gurl.h"
@@ -227,16 +227,8 @@ void AwContentsClientBridge::ProvideClientCertificateResponse(
return;
}
- // Create an EVP_PKEY wrapper for the private key JNI reference.
- crypto::ScopedEVP_PKEY private_key(
- net::android::GetOpenSSLPrivateKeyWrapper(private_key_ref.obj()));
- if (!private_key.get()) {
- LOG(ERROR) << "Could not create OpenSSL wrapper for private key";
- return;
- }
-
scoped_refptr<net::SSLPrivateKey> client_private_key =
- net::WrapOpenSSLPrivateKey(std::move(private_key));
+ net::WrapJavaPrivateKey(private_key_ref.obj());
// Release the guard and |pending_client_cert_request_delegates_| references
// to |delegate|.
« no previous file with comments | « no previous file | chrome/browser/ui/android/ssl_client_certificate_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698