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

Side by Side Diff: net/android/java/src/org/chromium/net/AndroidKeyStore.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, 9 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import org.chromium.base.CalledByNative; 7 import org.chromium.base.CalledByNative;
8 import org.chromium.base.JNINamespace; 8 import org.chromium.base.JNINamespace;
9 9
10 /** 10 /**
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 * 128 *
129 * To better understand what's going on below, please refer to the 129 * To better understand what's going on below, please refer to the
130 * following source files in the Android 4.0.4 and 4.1 source trees: 130 * following source files in the Android 4.0.4 and 4.1 source trees:
131 * libcore/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLR SAPrivateKey.java 131 * libcore/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLR SAPrivateKey.java
132 * libcore/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_Native Crypto.cpp 132 * libcore/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_Native Crypto.cpp
133 * 133 *
134 * @param key The PrivateKey handle. 134 * @param key The PrivateKey handle.
135 * @return The EVP_PKEY handle, as a 32-bit integer (0 if not available) 135 * @return The EVP_PKEY handle, as a 32-bit integer (0 if not available)
136 */ 136 */
137 @CalledByNative 137 @CalledByNative
138 int getOpenSSLHandleForPrivateKey(AndroidPrivateKey key); 138 long getOpenSSLHandleForPrivateKey(AndroidPrivateKey key);
139 139
140 /** 140 /**
141 * Called when the native OpenSSL engine no longer needs access to the under lying key. 141 * Called when the native OpenSSL engine no longer needs access to the under lying key.
142 */ 142 */
143 @CalledByNative 143 @CalledByNative
144 void releaseKey(AndroidPrivateKey key); 144 void releaseKey(AndroidPrivateKey key);
145 } 145 }
OLDNEW
« 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