timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renaming JNI API decryptMessage in decryptMessageJni

Browse source
This commit is contained in:
pedroGitt 2016-10-13 10:44:59 +02:00
parent e59ee33b67
commit 572c7cd464
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
View file

@ -69,7 +69,6 @@ public class OlmSession {
mNativeOlmSessionId = 0; mNativeOlmSessionId = 0;
} }
/** /**
* Create and save the session native instance ID. * Create and save the session native instance ID.
* Wrapper for {@link #initNewSessionJni()}.<br> * Wrapper for {@link #initNewSessionJni()}.<br>
@ -257,6 +256,10 @@ public class OlmSession {
* @param aEncryptedMsg message to decrypt * @param aEncryptedMsg message to decrypt
* @return the decrypted message if operation succeed, null otherwise * @return the decrypted message if operation succeed, null otherwise
*/ */
public native String decryptMessage(OlmMessage aEncryptedMsg); public String decryptMessage(OlmMessage aEncryptedMsg) {
return decryptMessageJni(aEncryptedMsg);
}
private native String decryptMessageJni(OlmMessage aEncryptedMsg);
} }

28
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
View file

@ -565,7 +565,7 @@ JNIEXPORT jint OLM_SESSION_FUNC_DEF(encryptMessageJni)(JNIEnv *env, jobject thiz
* @param aEncryptedMsg message to decrypt * @param aEncryptedMsg message to decrypt
* @return decrypted message if operation succeed, null otherwise * @return decrypted message if operation succeed, null otherwise
*/ */
JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg) JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessageJni)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg)
{ {
jstring decryptedMsgRetValue = 0; jstring decryptedMsgRetValue = 0;
jclass encryptedMsgJclass = 0; jclass encryptedMsgJclass = 0;
@ -579,35 +579,35 @@ JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz
void *plainTextMsgPtr = NULL; void *plainTextMsgPtr = NULL;
char *tempEncryptedPtr = NULL; char *tempEncryptedPtr = NULL;
LOGD("## decryptMessage(): IN "); LOGD("## decryptMessageJni(): IN ");
if(NULL == (sessionPtr = (OlmSession*)getSessionInstanceId(env,thiz))) if(NULL == (sessionPtr = (OlmSession*)getSessionInstanceId(env,thiz)))
{ {
LOGE("## decryptMessage(): failure - invalid Session ptr=NULL"); LOGE("## decryptMessageJni(): failure - invalid Session ptr=NULL");
} }
else if(0 == aEncryptedMsg) else if(0 == aEncryptedMsg)
{ {
LOGE("## decryptMessage(): failure - invalid clear message"); LOGE("## decryptMessageJni(): failure - invalid clear message");
} }
else if(0 == (encryptedMsgJclass = env->GetObjectClass(aEncryptedMsg))) else if(0 == (encryptedMsgJclass = env->GetObjectClass(aEncryptedMsg)))
{ {
LOGE("## decryptMessage(): failure - unable to get crypted message class"); LOGE("## decryptMessageJni(): failure - unable to get crypted message class");
} }
else if(0 == (encryptedMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mCipherText","Ljava/lang/String;"))) else if(0 == (encryptedMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mCipherText","Ljava/lang/String;")))
{ {
LOGE("## decryptMessage(): failure - unable to get message field"); LOGE("## decryptMessageJni(): failure - unable to get message field");
} }
else if(0 == (typeMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mType","J"))) else if(0 == (typeMsgFieldId = env->GetFieldID(encryptedMsgJclass,"mType","J")))
{ {
LOGE("## decryptMessage(): failure - unable to get message type field"); LOGE("## decryptMessageJni(): failure - unable to get message type field");
} }
else if(0 == (encryptedMsgJstring = (jstring)env->GetObjectField(aEncryptedMsg, encryptedMsgFieldId))) else if(0 == (encryptedMsgJstring = (jstring)env->GetObjectField(aEncryptedMsg, encryptedMsgFieldId)))
{ {
LOGE("## decryptMessage(): failure - JNI encrypted object "); LOGE("## decryptMessageJni(): failure - JNI encrypted object ");
} }
else if(0 == (encryptedMsgPtr = env->GetStringUTFChars(encryptedMsgJstring, 0))) else if(0 == (encryptedMsgPtr = env->GetStringUTFChars(encryptedMsgJstring, 0)))
{ {
LOGE("## decryptMessage(): failure - encrypted message JNI allocation OOM"); LOGE("## decryptMessageJni(): failure - encrypted message JNI allocation OOM");
} }
else else
{ {
@ -619,7 +619,7 @@ JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz
// create a dedicated temp buffer to be used in next Olm API calls // create a dedicated temp buffer to be used in next Olm API calls
tempEncryptedPtr = static_cast<char*>(malloc(encryptedMsgLength*sizeof(uint8_t))); tempEncryptedPtr = static_cast<char*>(malloc(encryptedMsgLength*sizeof(uint8_t)));
memcpy(tempEncryptedPtr, encryptedMsgPtr, encryptedMsgLength); memcpy(tempEncryptedPtr, encryptedMsgPtr, encryptedMsgLength);
LOGD("## decryptMessage(): MsgType=%ld encryptedMsgLength=%lu encryptedMsg=%s",encryptedMsgType,encryptedMsgLength,encryptedMsgPtr); LOGD("## decryptMessageJni(): MsgType=%ld encryptedMsgLength=%lu encryptedMsg=%s",encryptedMsgType,encryptedMsgLength,encryptedMsgPtr);
// get max plaintext length // get max plaintext length
size_t maxPlainTextLength = olm_decrypt_max_plaintext_length(sessionPtr, size_t maxPlainTextLength = olm_decrypt_max_plaintext_length(sessionPtr,
@ -631,11 +631,11 @@ JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz
if(maxPlainTextLength == olm_error()) if(maxPlainTextLength == olm_error())
{ {
const char *errorMsgPtr = olm_session_last_error(sessionPtr); const char *errorMsgPtr = olm_session_last_error(sessionPtr);
LOGE("## decryptMessage(): failure - olm_decrypt_max_plaintext_length Msg=%s",errorMsgPtr); LOGE("## decryptMessageJni(): failure - olm_decrypt_max_plaintext_length Msg=%s",errorMsgPtr);
} }
else else
{ {
LOGD("## decryptMessage(): maxPlaintextLength=%lu",maxPlainTextLength); LOGD("## decryptMessageJni(): maxPlaintextLength=%lu",maxPlainTextLength);
// allocate output decrypted message // allocate output decrypted message
plainTextMsgPtr = static_cast<void*>(malloc(maxPlainTextLength*sizeof(uint8_t))); plainTextMsgPtr = static_cast<void*>(malloc(maxPlainTextLength*sizeof(uint8_t)));
@ -651,14 +651,14 @@ JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz
if(plaintextLength == olm_error()) if(plaintextLength == olm_error())
{ {
const char *errorMsgPtr = olm_session_last_error(sessionPtr); const char *errorMsgPtr = olm_session_last_error(sessionPtr);
LOGE("## decryptMessage(): failure - olm_decrypt Msg=%s",errorMsgPtr); LOGE("## decryptMessageJni(): failure - olm_decrypt Msg=%s",errorMsgPtr);
} }
else else
{ {
// update decrypted buffer size // update decrypted buffer size
(static_cast<char*>(plainTextMsgPtr))[plaintextLength] = static_cast<char>('\0'); (static_cast<char*>(plainTextMsgPtr))[plaintextLength] = static_cast<char>('\0');
LOGD("## decryptMessage(): decrypted returnedLg=%lu plainTextMsgPtr=%s",plaintextLength, static_cast<char*>(plainTextMsgPtr)); LOGD("## decryptMessageJni(): decrypted returnedLg=%lu plainTextMsgPtr=%s",plaintextLength, static_cast<char*>(plainTextMsgPtr));
decryptedMsgRetValue = env->NewStringUTF(static_cast<const char*>(plainTextMsgPtr)); decryptedMsgRetValue = env->NewStringUTF(static_cast<const char*>(plainTextMsgPtr));
} }
} }

2
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
View file

@ -42,7 +42,7 @@ JNIEXPORT jint OLM_SESSION_FUNC_DEF(matchesInboundSessionFromIdKeyJni)(JNIEnv *e
// encrypt/decrypt // encrypt/decrypt
JNIEXPORT jint OLM_SESSION_FUNC_DEF(encryptMessageJni)(JNIEnv *env, jobject thiz, jstring aClearMsg, jobject aEncryptedMsg); JNIEXPORT jint OLM_SESSION_FUNC_DEF(encryptMessageJni)(JNIEnv *env, jobject thiz, jstring aClearMsg, jobject aEncryptedMsg);
JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessage)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg); JNIEXPORT jstring OLM_SESSION_FUNC_DEF(decryptMessageJni)(JNIEnv *env, jobject thiz, jobject aEncryptedMsg);
JNIEXPORT jstring OLM_SESSION_FUNC_DEF(getSessionIdentifierJni)(JNIEnv *env, jobject thiz); JNIEXPORT jstring OLM_SESSION_FUNC_DEF(getSessionIdentifierJni)(JNIEnv *env, jobject thiz);