diff options
author | Arne Schwabe <arne@rfc2549.org> | 2012-07-15 16:16:57 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-15 16:16:57 +0200 |
commit | ba4844b8a72d7149af5774a4abdbf44fea90d662 (patch) | |
tree | 72f2471dc0a67ac6edfe13fbb0814799d81fb924 /openvpn | |
parent | 44997861f42538aee1bda342b5cc4e2fb1efa2aa (diff) |
Add support for Certificates from Keystore under Jelly Beans (Thanks Kenny Root for the right pointers)
Move jniglue/minivpn files to more sensitive places
Diffstat (limited to 'openvpn')
-rw-r--r-- | openvpn/Android.mk | 21 | ||||
-rw-r--r-- | openvpn/src/openvpn/jniglue.c | 21 | ||||
-rw-r--r-- | openvpn/src/openvpn/jniglue.h | 12 | ||||
-rw-r--r-- | openvpn/src/openvpn/testmain.c | 0 |
4 files changed, 1 insertions, 53 deletions
diff --git a/openvpn/Android.mk b/openvpn/Android.mk index ca15c711..2008adb1 100644 --- a/openvpn/Android.mk +++ b/openvpn/Android.mk @@ -6,8 +6,6 @@ include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -llog LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include - - #LOCAL_SHARED_LIBRARIES := libssl libcrypto liblzo LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static @@ -15,7 +13,7 @@ LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static LOCAL_CFLAGS= -DHAVE_CONFIG_H LOCAL_MODULE = openvpn -LOCAL_SRC_FILES:= src/openvpn/jniglue.c \ +LOCAL_SRC_FILES:= \ src/compat/compat-basename.c \ src/compat/compat-daemon.c \ src/compat/compat-dirname.c \ @@ -92,21 +90,4 @@ include $(BUILD_SHARED_LIBRARY) #include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) - -LOCAL_LDLIBS := -llog -LOCAL_SRC_FILES:= src/openvpn/jniglue.c -LOCAL_MODULE = opvpnutil -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) - - -LOCAL_LDLIBS := -llog -LOCAL_SRC_FILES:= src/openvpn/testmain.c -LOCAL_MODULE = minivpn -LOCAL_SHARED_LIBRARIES=openvpn -include $(BUILD_EXECUTABLE) - diff --git a/openvpn/src/openvpn/jniglue.c b/openvpn/src/openvpn/jniglue.c deleted file mode 100644 index a385d130..00000000 --- a/openvpn/src/openvpn/jniglue.c +++ /dev/null @@ -1,21 +0,0 @@ -#include <jni.h> -#include <android/log.h> -#include <stdlib.h> -#include <setjmp.h> - -#include "jniglue.h" - -jint JNI_OnLoad(JavaVM *vm, void *reserved) { - __android_log_write(ANDROID_LOG_DEBUG,"openvpn", "Loading openvpn native library $id$ compiled on " __DATE__ " " __TIME__ ); - return JNI_VERSION_1_2; -} - - -void android_openvpn_log(int level,const char* prefix,const char* prefix_sep,const char* m1) -{ - __android_log_print(ANDROID_LOG_DEBUG,"openvpn","%s%s%s",prefix,prefix_sep,m1); -} - -void Java_de_blinkt_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jobject jo, jint fd) { - int ret = close(fd); -} diff --git a/openvpn/src/openvpn/jniglue.h b/openvpn/src/openvpn/jniglue.h deleted file mode 100644 index a86d52da..00000000 --- a/openvpn/src/openvpn/jniglue.h +++ /dev/null @@ -1,12 +0,0 @@ -// -// jniglue.h -// xcopenvpn -// -// Created by Arne Schwabe on 29.03.12. -// Copyright (c) 2012 Universität Paderborn. All rights reserved. -// - -#ifndef xcopenvpn_jniglue_h -#define xcopenvpn_jniglue_h -void android_openvpn_log(int level,const char* prefix,const char* prefix_sep,const char* m1); -#endif diff --git a/openvpn/src/openvpn/testmain.c b/openvpn/src/openvpn/testmain.c deleted file mode 100644 index e69de29b..00000000 --- a/openvpn/src/openvpn/testmain.c +++ /dev/null |