am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding"
* commit '59ef364a8888ce8ec05d55f9093536ecf6d43aa6':
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index 9df4dbd..4a9f21d 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1904,7 +1904,7 @@
client->sslClientCert(privateKey.release(), certificate);
}
-static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jint ctx, jobjectArray chain)
+static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jlong ctx, jobjectArray chain)
{
WebUrlLoaderClient* client = reinterpret_cast<WebUrlLoaderClient*>(handle);
EVP_PKEY* pkey = reinterpret_cast<EVP_PKEY*>(static_cast<uintptr_t>(ctx));
@@ -1979,7 +1979,7 @@
(void*) SslCertErrorProceed },
{ "nativeSslCertErrorCancel", "(II)V",
(void*) SslCertErrorCancel },
- { "nativeSslClientCert", "(II[[B)V",
+ { "nativeSslClientCert", "(IJ[[B)V",
(void*) SslClientCertCtx },
{ "nativeSslClientCert", "(I[B[[B)V",
(void*) SslClientCertPKCS8 },
