Use long instead of int as the return value of the

NativeCrypto.SSL_do_handshake() to fix a crash in 64-bit builds which uses SSL. (fixes #739)
robovm · Feb 4, 2015 · b39bfe5 · b39bfe5
1 parent d5238b7
commit b39bfe5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rt/libcore/crypto/src/main/java/org/conscrypt/NativeCrypto.java b/rt/libcore/crypto/src/main/java/org/conscrypt/NativeCrypto.java
@@ -973,7 +973,7 @@ public static native void SSL_set_tlsext_host_name(long sslNativePointer, String
      * a server negotiation, supplying the {@code alpnProtocols} will enable
      * ALPN negotiation.
      */
-    public static native int SSL_do_handshake(long sslNativePointer,
+    public static native long SSL_do_handshake(long sslNativePointer,
                                               FileDescriptor fd,
                                               SSLHandshakeCallbacks shc,
                                               int timeoutMillis,

diff --git a/rt/libcore/crypto/src/main/java/org/conscrypt/OpenSSLSocketImpl.java b/rt/libcore/crypto/src/main/java/org/conscrypt/OpenSSLSocketImpl.java
@@ -400,7 +400,7 @@ private void checkOpen() throws SocketException {
                 }
             }
 
-            int sslSessionNativePointer;
+            long sslSessionNativePointer;
             try {
                 sslSessionNativePointer = NativeCrypto.SSL_do_handshake(sslNativePointer,
                         socket.getFileDescriptor$(), this, getSoTimeout(), client, npnProtocols,