aboutsummaryrefslogtreecommitdiff
path: root/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
diff options
context:
space:
mode:
authorpedroGitt <pedro.contreiras@amdocs.com>2016-10-07 17:35:27 +0200
committerpedroGitt <pedro.contreiras@amdocs.com>2016-10-07 17:35:27 +0200
commit67f79394708e5424e3eb65ee468edc8b2b5ec5e7 (patch)
tree957f221462010d8a1977688c7f3fc0f17e12dc57 /java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
parent655c841cc3720d1bb9892d60a2d7ca136c90cfbd (diff)
- Add decryptMessageJni() to olm_session.cpp API
- review comments header - refactor utility functions
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h')
-rw-r--r--java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
index 8e162b0..b04e71e 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
+++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
@@ -7,8 +7,6 @@
extern "C" {
#endif
-jlong getSessionInstanceId(JNIEnv* aJniEnv, jobject aJavaObject);
-
// session creation/destruction
JNIEXPORT void JNICALL Java_org_matrix_olm_OlmSession_releaseSessionJni(JNIEnv *env, jobject thiz);
JNIEXPORT jlong JNICALL Java_org_matrix_olm_OlmSession_initNewSessionJni(JNIEnv *env, jobject thiz);
@@ -24,15 +22,12 @@ JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_initInboundSessionFromIdKe
JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_matchesInboundSessionJni(JNIEnv *env, jobject thiz, jstring aOneTimeKeyMsg);
JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_matchesInboundSessionFromIdKeyJni(JNIEnv *env, jobject thiz, jstring aTheirIdentityKey, jstring aOneTimeKeyMsg);
+// encrypt/decrypt
JNIEXPORT jint JNICALL Java_org_matrix_olm_OlmSession_encryptMessageJni(JNIEnv *env, jobject thiz, jstring aClearMsg, jobject aEncryptedMsg);
+JNIEXPORT jstring JNICALL Java_org_matrix_olm_OlmSession_decryptMessageJni(JNIEnv *env, jobject thiz, jobject aEncryptedMsg);
JNIEXPORT jstring JNICALL Java_org_matrix_olm_OlmSession_getSessionIdentifierJni(JNIEnv *env, jobject thiz);
-
-// signing
-
-
-
#ifdef __cplusplus
}
#endif