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

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

Issue 182933002: Fix build issues in net/ for Android x64 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 10 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
Index: net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java
diff --git a/net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java b/net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java
index 5232e46b39d051b6ab15f54cee8f1a1331fa300d..cc6165772c1d29787e842371cdac75103480aa3c 100644
--- a/net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java
+++ b/net/android/java/src/org/chromium/net/DefaultAndroidKeyStore.java
@@ -143,7 +143,7 @@ public class DefaultAndroidKeyStore implements AndroidKeyStore {
}
@Override
- public int getOpenSSLHandleForPrivateKey(AndroidPrivateKey key) {
+ public long getOpenSSLHandleForPrivateKey(AndroidPrivateKey key) {
PrivateKey javaKey = ((DefaultAndroidPrivateKey) key).getJavaKey();
// Sanity checks
if (javaKey == null) {
@@ -207,9 +207,9 @@ public class DefaultAndroidKeyStore implements AndroidKeyStore {
return 0;
}
getPkeyContext.setAccessible(true);
- int evp_pkey = 0;
+ long evp_pkey = 0;
try {
- evp_pkey = (Integer) getPkeyContext.invoke(opensslKey);
+ evp_pkey = (Long) getPkeyContext.invoke(opensslKey);
} finally {
getPkeyContext.setAccessible(false);
}

Powered by Google App Engine
This is Rietveld 408576698