WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

JNI: fix native exception handling in 3DES

pull/2/merge
Chris Conlon 2017-04-28 18:03:10 -06:00
parent 609cfec607
commit a3adaef65b
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
jni/jni_des3.c
View File

@ -57,9 +57,18 @@ Java_com_wolfssl_wolfcrypt_Des3_native_1set_1key(
{ {
#ifndef NO_DES3 #ifndef NO_DES3
int ret = 0; int ret = 0;
Des3* des = (Des3*) getNativeStruct(env, this); Des3* des = NULL;
byte* key = getByteArray(env, key_object); byte* key = NULL;
byte* iv = getByteArray(env, iv_object); byte* iv = NULL;
des = (Des3*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
/* getNativeStruct may throw exception, prevent throwing another */
return;
}
key = getByteArray(env, key_object);
iv = getByteArray(env, iv_object);
ret = (!des || !key) /* iv is optional */ ret = (!des || !key) /* iv is optional */
? BAD_FUNC_ARG ? BAD_FUNC_ARG
@ -86,9 +95,18 @@ Java_com_wolfssl_wolfcrypt_Des3_native_1update__I_3BII_3BI(
int ret = 0; int ret = 0;
#ifndef NO_DES3 #ifndef NO_DES3
Des3* des = (Des3*) getNativeStruct(env, this); Des3* des = NULL;
byte* input = getByteArray(env, input_object); byte* input = NULL;
byte* output = getByteArray(env, output_object); byte* output = NULL;
des = (Des3*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
/* getNativeStruct may throw exception, prevent throwing another */
return 0;
}
input = getByteArray(env, input_object);
output = getByteArray(env, output_object);
if (!des || !input || !output) { if (!des || !input || !output) {
ret = BAD_FUNC_ARG; /* NULL sanitizers */ ret = BAD_FUNC_ARG; /* NULL sanitizers */
@ -142,9 +160,18 @@ Java_com_wolfssl_wolfcrypt_Des3_native_1update__ILjava_nio_ByteBuffer_2IILjava_n
int ret = 0; int ret = 0;
#ifndef NO_DES3 #ifndef NO_DES3
Des3* des = (Des3*) getNativeStruct(env, this); Des3* des = NULL;
byte* input = getDirectBufferAddress(env, input_object); byte* input = NULL;
byte* output = getDirectBufferAddress(env, output_object); byte* output = NULL;
des = (Des3*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
/* getNativeStruct may throw exception, prevent throwing another */
return 0;
}
input = getDirectBufferAddress(env, input_object);
output = getDirectBufferAddress(env, output_object);
if (!des || !input || !output) { if (!des || !input || !output) {
ret = BAD_FUNC_ARG; /* NULL sanitizers */ ret = BAD_FUNC_ARG; /* NULL sanitizers */