diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-03-05 00:56:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-05 00:56:07 +0000 |
| commit | 44c5ab945401080852dfd614e0f18fe39fff94e0 (patch) | |
| tree | 2805d68e200efedb55cd48ef907b442f2ddf9214 | |
| parent | 877f98dfb48635a05091716319d6971197136055 (diff) | |
| parent | 59ef364a8888ce8ec05d55f9093536ecf6d43aa6 (diff) | |
| download | webkit-44c5ab945401080852dfd614e0f18fe39fff94e0.tar.gz | |
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
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 9df4dbdc4..4a9f21dff 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1904,7 +1904,7 @@ static void SslClientCertPKCS8(JNIEnv *env, jobject obj, int handle, jbyteArray 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 @@ static JNINativeMethod gBrowserFrameNativeMethods[] = { (void*) SslCertErrorProceed }, { "nativeSslCertErrorCancel", "(II)V", (void*) SslCertErrorCancel }, - { "nativeSslClientCert", "(II[[B)V", + { "nativeSslClientCert", "(IJ[[B)V", (void*) SslClientCertCtx }, { "nativeSslClientCert", "(I[B[[B)V", (void*) SslClientCertPKCS8 }, |