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

Unified Diff: net/android/java/src/org/chromium/net/AndroidKeyStore.java

Issue 365503007: Insulate the legacy Android client auth code from OpenSSL ABI changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Mismerge Created 6 years, 5 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 | net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/java/src/org/chromium/net/AndroidKeyStore.java
diff --git a/net/android/java/src/org/chromium/net/AndroidKeyStore.java b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
index 8c85a47a869e9443fd0120dc670f1ce6015b66f6..3c7e6fc68d0630ab4abf95ee700e972ec8ff00c4 100644
--- a/net/android/java/src/org/chromium/net/AndroidKeyStore.java
+++ b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
@@ -138,6 +138,19 @@ public interface AndroidKeyStore {
long getOpenSSLHandleForPrivateKey(AndroidPrivateKey key);
/**
+ * Return the OpenSSLEngine object corresponding to a given PrivateKey
+ * object.
+ *
+ * This shall only be used for Android 4.1 to work around a platform bug.
+ * See https://crbug.com/381465.
+ *
+ * @param key The PrivateKey handle.
+ * @return The OpenSSLEngine object (or null if not available)
+ */
+ @CalledByNative
+ Object getOpenSSLEngineForPrivateKey(AndroidPrivateKey key);
+
+ /**
* Called when the native OpenSSL engine no longer needs access to the underlying key.
*/
@CalledByNative
« no previous file with comments | « no previous file | net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698