From 656f8e4de1be3e6b03ffd760c693c07e4a737b98 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 6 Jan 2017 22:34:15 +0900 Subject: [PATCH] Added support for openssl 1.1 Signed-off-by: Michele Calgaro --- tdejava/koala/tdejava/KSSL.cpp | 4 ++-- tdejava/koala/tdejava/KSSL.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tdejava/koala/tdejava/KSSL.cpp b/tdejava/koala/tdejava/KSSL.cpp index b969b548..143a29df 100644 --- a/tdejava/koala/tdejava/KSSL.cpp +++ b/tdejava/koala/tdejava/KSSL.cpp @@ -189,9 +189,9 @@ static TQString* _qstring_realHost = 0; } JNIEXPORT jboolean JNICALL -Java_org_trinitydesktop_koala_KSSL_setSession(JNIEnv* env, jobject obj, jobject session) +Java_org_trinitydesktop_koala_KSSL_takeSession(JNIEnv* env, jobject obj, jobject session) { - jboolean xret = (jboolean) ((KSSL*) QtSupport::getQt(env, obj))->setSession((const KSSLSession*) QtSupport::getQt(env, session)); + jboolean xret = (jboolean) ((KSSL*) QtSupport::getQt(env, obj))->takeSession((KSSLSession*) QtSupport::getQt(env, session)); return xret; } diff --git a/tdejava/koala/tdejava/KSSL.h b/tdejava/koala/tdejava/KSSL.h index a371d163..2e2e757b 100644 --- a/tdejava/koala/tdejava/KSSL.h +++ b/tdejava/koala/tdejava/KSSL.h @@ -14,7 +14,7 @@ extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KSSL_newKSSL__Z (JNI extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KSSL_newKSSL__ (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_initialize (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_TLSInit (JNIEnv *env, jobject); -extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_setSession (JNIEnv *env, jobject, jobject); +extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_takeSession (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_org_trinitydesktop_koala_KSSL_close (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_reInitialize (JNIEnv *env, jobject); extern JNIEXPORT jboolean JNICALL Java_org_trinitydesktop_koala_KSSL_reconfig (JNIEnv *env, jobject);