summaryrefslogtreecommitdiff
path: root/jni
diff options
context:
space:
mode:
Diffstat (limited to 'jni')
-rw-r--r--jni/Android.mk2
-rw-r--r--jni/jbcrypto.cpp29
2 files changed, 27 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 761fa005..3de07059 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -25,7 +25,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_LDLIBS := -llog
LOCAL_SRC_FILES:= minivpn.c
-LOCAL_MODULE = minivp
+LOCAL_MODULE = minivpn
LOCAL_SHARED_LIBRARIES=openvpn
include $(BUILD_EXECUTABLE)
diff --git a/jni/jbcrypto.cpp b/jni/jbcrypto.cpp
index 0c56b974..8bc6fb8d 100644
--- a/jni/jbcrypto.cpp
+++ b/jni/jbcrypto.cpp
@@ -12,11 +12,34 @@
#include <openssl/rsa.h>
#include <openssl/objects.h>
#include <openssl/md5.h>
+#include <android/log.h>
+#include <openssl/err.h>
+
extern "C" {
jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef);
}
+int jniThrowException(JNIEnv* env, const char* className, const char* msg) {
+
+ jclass exceptionClass = env->FindClass(className);
+
+ if (exceptionClass == NULL) {
+ __android_log_print(ANDROID_LOG_DEBUG,"openvpn","Unable to find exception class %s", className);
+ /* ClassNotFoundException now pending */
+ return -1;
+ }
+
+ if (env->ThrowNew( exceptionClass, msg) != JNI_OK) {
+ __android_log_print(ANDROID_LOG_DEBUG,"openvpn","Failed throwing '%s' '%s'", className, msg);
+ /* an exception, most likely OOM, will now be pending */
+ return -1;
+ }
+
+ env->DeleteLocalRef(exceptionClass);
+ return 0;
+}
+
jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) {
@@ -32,9 +55,10 @@ jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, j
jbyte* data = env-> GetByteArrayElements (from, NULL);
int datalen = env-> GetArrayLength(from);
- if(data==NULL || datalen == )
+ if(data==NULL )
+ jniThrowException(env, "java/lang/NullPointerException", "data is null");
- unsigned int siglen;
+ unsigned int siglen;
unsigned char* sigret = (unsigned char*)malloc(RSA_size(pkey->pkey.rsa));
@@ -46,7 +70,6 @@ jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, j
sigret, &siglen, pkey->pkey.rsa) <= 0 )
{
- ERR_print_errors(errbio);
jniThrowException(env, "java/security/InvalidKeyException", "rsa_sign went wrong, see logcat");
ERR_print_errors_fp(stderr);