From 5fc5d37330d3535a0f421632694d1e7918fc22d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 11:38:09 +0200 Subject: Compiles correctly: app/build-native + gradle. --- app/jni/Android.mk | 29 ++++++++++++++++ app/jni/Application.mk | 8 +++++ app/jni/buildall.mk | 69 ++++++++++++++++++++++++++++++++++++++ app/jni/jbcrypto.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ app/jni/jniglue.c | 22 ++++++++++++ app/jni/jniglue.h | 12 +++++++ app/jni/minivpn.c | 0 app/jni/prebuilt.mk | 27 +++++++++++++++ 8 files changed, 257 insertions(+) create mode 100644 app/jni/Android.mk create mode 100644 app/jni/Application.mk create mode 100644 app/jni/buildall.mk create mode 100644 app/jni/jbcrypto.cpp create mode 100644 app/jni/jniglue.c create mode 100644 app/jni/jniglue.h create mode 100644 app/jni/minivpn.c create mode 100644 app/jni/prebuilt.mk (limited to 'app/jni') diff --git a/app/jni/Android.mk b/app/jni/Android.mk new file mode 100644 index 00000000..3514b920 --- /dev/null +++ b/app/jni/Android.mk @@ -0,0 +1,29 @@ +# Path of the sources +JNI_DIR := $(call my-dir) + +include lzo/Android.mk + +include openssl/Android.mk + +include openvpn/Android.mk + + +LOCAL_PATH := $(JNI_DIR) + +# The only real JNI library +include $(CLEAR_VARS) +LOCAL_LDLIBS := -llog -lz +LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl +LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp +LOCAL_MODULE = opvpnutil +LOCAL_SHARED_LIBRARIES := libcrypto +include $(BUILD_SHARED_LIBRARY) + + +include $(CLEAR_VARS) +LOCAL_LDLIBS := -lz -lc +LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn +LOCAL_SRC_FILES:= minivpn.c +LOCAL_MODULE = minivpn +include $(BUILD_EXECUTABLE) + diff --git a/app/jni/Application.mk b/app/jni/Application.mk new file mode 100644 index 00000000..0795b5b8 --- /dev/null +++ b/app/jni/Application.mk @@ -0,0 +1,8 @@ +APP_ABI := all +NDK_TOOLCHAIN_VERSION=4.8 +APP_PLATFORM := android-14 +APP_STL:=stlport_static + +#APP_OPTIM := release + +#LOCAL_ARM_MODE := arm diff --git a/app/jni/buildall.mk b/app/jni/buildall.mk new file mode 100644 index 00000000..e1d6fdbc --- /dev/null +++ b/app/jni/buildall.mk @@ -0,0 +1,69 @@ +# Build curl +include $(CURRENT_DIR)/curl/Android.mk + + +include $(CLEAR_VARS) + + +# SIGC++ Library built as static library +LOCAL_MODULE := sigc +LOCAL_PATH = $(CURRENT_DIR) +LOCAL_CPP_EXTENSION := .cc + + + +LOCAL_SRC_FILES := sigc++/signal.cc sigc++/signal_base.cc sigc++/trackable.cc +LOCAL_SRC_FILES += sigc++/functors/slot_base.cc sigc++/adaptors/lambda/lambda.cc +LOCAL_SRC_FILES += sigc++/connection.cc sigc++/functors/slot.cc + + +LOCAL_C_INCLUDES := sigc++ + +include $(BUILD_STATIC_LIBRARY) + +# Torrent library + +include $(CLEAR_VARS) + + +LOCAL_PATH := $(CURRENT_DIR)/libtorrent/src +LOCAL_C_INCLUDES := $(CURRENT_DIR)/libtorrent $(CURRENT_DIR) $(CURRENT_DIR)/libtorrent/src $(CURRENT_DIR)/libtorrent/src/torrent +LOCAL_CPP_EXTENSION := .cc +LOCAL_MODULE = rtorrent + +LOCAL_SRC_FILES = globals.cc resource_manager.cc manager.cc + +#torrent subdirs +LOCAL_SRC_FILES+= torrent/data/block.cc torrent/data/block_list.cc torrent/data/chunk_utils.cc torrent/data/file.cc torrent/data/file_list.cc torrent/data/file_list_iterator.cc torrent/data/file_manager.cc torrent/data/file_utils.cc torrent/data/transfer_list.cc torrent/peer/client_info.cc torrent/peer/client_list.cc torrent/peer/connection_list.cc torrent/peer/peer.cc torrent/peer/peer_info.cc torrent/peer/peer_list.cc + + + +#data +LOCAL_SRC_FILES+= data/chunk.cc data/chunk_list.cc data/chunk_part.cc data/hash_chunk.cc data/hash_queue.cc data/hash_queue_node.cc data/hash_torrent.cc data/memory_chunk.cc data/socket_file.cc + +# dht +LOCAL_SRC_FILES+= dht/dht_bucket.cc dht/dht_node.cc dht/dht_router.cc dht/dht_server.cc dht/dht_tracker.cc dht/dht_transaction.cc + +#download +LOCAL_SRC_FILES+= download/available_list.cc download/choke_manager.cc download/chunk_selector.cc download/chunk_statistics.cc download/delegator.cc download/download_constructor.cc download/download_main.cc download/download_manager.cc download/download_wrapper.cc + +# net +LOCAL_SRC_FILES+=net/address_list.cc net/listen.cc net/socket_base.cc net/socket_datagram.cc net/socket_fd.cc net/socket_set.cc net/socket_stream.cc net/throttle_internal.cc net/throttle_list.cc + +#protocol +LOCAL_SRC_FILES+=protocol/extensions.cc protocol/handshake.cc protocol/handshake_encryption.cc protocol/handshake_manager.cc protocol/initial_seed.cc protocol/peer_connection_base.cc protocol/peer_connection_leech.cc protocol/peer_connection_metadata.cc protocol/peer_factory.cc protocol/request_list.cc + +# torrent +LOCAL_SRC_FILES+= torrent/bitfield.cc torrent/chunk_manager.cc torrent/connection_manager.cc torrent/dht_manager.cc torrent/download.cc torrent/error.cc torrent/exceptions.cc torrent/hash_string.cc torrent/http.cc torrent/object.cc torrent/object_static_map.cc torrent/object_stream.cc torrent/path.cc torrent/poll_epoll.cc torrent/poll_kqueue.cc torrent/poll_select.cc torrent/rate.cc torrent/resume.cc torrent/thread_base.cc torrent/throttle.cc torrent/torrent.cc torrent/tracker.cc torrent/tracker_list.cc + + +#tracker +LOCAL_SRC_FILES+= tracker/tracker_dht.cc tracker/tracker_http.cc tracker/tracker_manager.cc tracker/tracker_udp.cc + +#utils +LOCAL_SRC_FILES+= utils/diffie_hellman.cc utils/sha_fast.cc + + +LOCAL_STATIC_LIBRARIES := sigc + +include $(BUILD_STATIC_LIBRARY) diff --git a/app/jni/jbcrypto.cpp b/app/jni/jbcrypto.cpp new file mode 100644 index 00000000..1c3e3ca9 --- /dev/null +++ b/app/jni/jbcrypto.cpp @@ -0,0 +1,90 @@ +// +// JBCyrpto.cpp +// xcopenvpn +// +// Created by Arne Schwabe on 12.07.12. +// Copyright (c) 2012 Universität Paderborn. All rights reserved. +// + +#include + +#include +#include +#include +#include +#include +#include + + +extern "C" { +jbyteArray Java_se_leap_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_se_leap_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) { + + // EVP_MD_CTX* ctx = reinterpret_cast(ctxRef); + EVP_PKEY* pkey = reinterpret_cast(pkeyRef); + + + if (pkey == NULL || from == NULL) { + jniThrowException(env, "java/lang/NullPointerException", "EVP_KEY is null"); + return NULL; + } + + jbyte* data = env-> GetByteArrayElements (from, NULL); + int datalen = env-> GetArrayLength(from); + + if(data==NULL ) + jniThrowException(env, "java/lang/NullPointerException", "data is null"); + + unsigned int siglen; + unsigned char* sigret = (unsigned char*)malloc(RSA_size(pkey->pkey.rsa)); + + + //int RSA_sign(int type, const unsigned char *m, unsigned int m_len, + // unsigned char *sigret, unsigned int *siglen, RSA *rsa); + + // adapted from s3_clnt.c + if (RSA_sign(NID_md5_sha1, (unsigned char*) data, datalen, + sigret, &siglen, pkey->pkey.rsa) <= 0 ) + { + + jniThrowException(env, "java/security/InvalidKeyException", "rsa_sign went wrong, see logcat"); + + ERR_print_errors_fp(stderr); + return NULL; + + + } + + + jbyteArray jb; + + jb =env->NewByteArray(siglen); + + env->SetByteArrayRegion(jb, 0, siglen, (jbyte *) sigret); + free(sigret); + return jb; + +} diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c new file mode 100644 index 00000000..143cd10b --- /dev/null +++ b/app/jni/jniglue.c @@ -0,0 +1,22 @@ +#include +#include +#include +#include + +#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_se_leap_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jclass jo, jint fd) { + int ret = close(fd); +} + diff --git a/app/jni/jniglue.h b/app/jni/jniglue.h new file mode 100644 index 00000000..a86d52da --- /dev/null +++ b/app/jni/jniglue.h @@ -0,0 +1,12 @@ +// +// 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/app/jni/minivpn.c b/app/jni/minivpn.c new file mode 100644 index 00000000..e69de29b diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk new file mode 100644 index 00000000..51bf1003 --- /dev/null +++ b/app/jni/prebuilt.mk @@ -0,0 +1,27 @@ +# Build curl + +include $(CLEAR_VARS) +LOCAL_MODULE := curl +LOCAL_SRC_FILES := prebuilt/libcurl.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +# SIGC + +include $(CLEAR_VARS) +LOCAL_MODULE := sigc +LOCAL_SRC_FILES := prebuilt/libsigc.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) +# Torrent library +LOCAL_MODULE := rtorrent +LOCAL_SRC_FILES := prebuilt/librtorrent.a +LOCAL_PATH = $(CURRENT_DIR) + +LOCAL_STATIC_LIBRARIES := sigc + +include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3 From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/jni/Android.mk | 29 ---------------- app/jni/Application.mk | 8 ----- app/jni/buildall.mk | 69 -------------------------------------- app/jni/jbcrypto.cpp | 90 -------------------------------------------------- app/jni/jniglue.c | 22 ------------ app/jni/jniglue.h | 12 ------- app/jni/minivpn.c | 0 app/jni/prebuilt.mk | 27 --------------- 8 files changed, 257 deletions(-) delete mode 100644 app/jni/Android.mk delete mode 100644 app/jni/Application.mk delete mode 100644 app/jni/buildall.mk delete mode 100644 app/jni/jbcrypto.cpp delete mode 100644 app/jni/jniglue.c delete mode 100644 app/jni/jniglue.h delete mode 100644 app/jni/minivpn.c delete mode 100644 app/jni/prebuilt.mk (limited to 'app/jni') diff --git a/app/jni/Android.mk b/app/jni/Android.mk deleted file mode 100644 index 3514b920..00000000 --- a/app/jni/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Path of the sources -JNI_DIR := $(call my-dir) - -include lzo/Android.mk - -include openssl/Android.mk - -include openvpn/Android.mk - - -LOCAL_PATH := $(JNI_DIR) - -# The only real JNI library -include $(CLEAR_VARS) -LOCAL_LDLIBS := -llog -lz -LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl -LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp -LOCAL_MODULE = opvpnutil -LOCAL_SHARED_LIBRARIES := libcrypto -include $(BUILD_SHARED_LIBRARY) - - -include $(CLEAR_VARS) -LOCAL_LDLIBS := -lz -lc -LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn -LOCAL_SRC_FILES:= minivpn.c -LOCAL_MODULE = minivpn -include $(BUILD_EXECUTABLE) - diff --git a/app/jni/Application.mk b/app/jni/Application.mk deleted file mode 100644 index 0795b5b8..00000000 --- a/app/jni/Application.mk +++ /dev/null @@ -1,8 +0,0 @@ -APP_ABI := all -NDK_TOOLCHAIN_VERSION=4.8 -APP_PLATFORM := android-14 -APP_STL:=stlport_static - -#APP_OPTIM := release - -#LOCAL_ARM_MODE := arm diff --git a/app/jni/buildall.mk b/app/jni/buildall.mk deleted file mode 100644 index e1d6fdbc..00000000 --- a/app/jni/buildall.mk +++ /dev/null @@ -1,69 +0,0 @@ -# Build curl -include $(CURRENT_DIR)/curl/Android.mk - - -include $(CLEAR_VARS) - - -# SIGC++ Library built as static library -LOCAL_MODULE := sigc -LOCAL_PATH = $(CURRENT_DIR) -LOCAL_CPP_EXTENSION := .cc - - - -LOCAL_SRC_FILES := sigc++/signal.cc sigc++/signal_base.cc sigc++/trackable.cc -LOCAL_SRC_FILES += sigc++/functors/slot_base.cc sigc++/adaptors/lambda/lambda.cc -LOCAL_SRC_FILES += sigc++/connection.cc sigc++/functors/slot.cc - - -LOCAL_C_INCLUDES := sigc++ - -include $(BUILD_STATIC_LIBRARY) - -# Torrent library - -include $(CLEAR_VARS) - - -LOCAL_PATH := $(CURRENT_DIR)/libtorrent/src -LOCAL_C_INCLUDES := $(CURRENT_DIR)/libtorrent $(CURRENT_DIR) $(CURRENT_DIR)/libtorrent/src $(CURRENT_DIR)/libtorrent/src/torrent -LOCAL_CPP_EXTENSION := .cc -LOCAL_MODULE = rtorrent - -LOCAL_SRC_FILES = globals.cc resource_manager.cc manager.cc - -#torrent subdirs -LOCAL_SRC_FILES+= torrent/data/block.cc torrent/data/block_list.cc torrent/data/chunk_utils.cc torrent/data/file.cc torrent/data/file_list.cc torrent/data/file_list_iterator.cc torrent/data/file_manager.cc torrent/data/file_utils.cc torrent/data/transfer_list.cc torrent/peer/client_info.cc torrent/peer/client_list.cc torrent/peer/connection_list.cc torrent/peer/peer.cc torrent/peer/peer_info.cc torrent/peer/peer_list.cc - - - -#data -LOCAL_SRC_FILES+= data/chunk.cc data/chunk_list.cc data/chunk_part.cc data/hash_chunk.cc data/hash_queue.cc data/hash_queue_node.cc data/hash_torrent.cc data/memory_chunk.cc data/socket_file.cc - -# dht -LOCAL_SRC_FILES+= dht/dht_bucket.cc dht/dht_node.cc dht/dht_router.cc dht/dht_server.cc dht/dht_tracker.cc dht/dht_transaction.cc - -#download -LOCAL_SRC_FILES+= download/available_list.cc download/choke_manager.cc download/chunk_selector.cc download/chunk_statistics.cc download/delegator.cc download/download_constructor.cc download/download_main.cc download/download_manager.cc download/download_wrapper.cc - -# net -LOCAL_SRC_FILES+=net/address_list.cc net/listen.cc net/socket_base.cc net/socket_datagram.cc net/socket_fd.cc net/socket_set.cc net/socket_stream.cc net/throttle_internal.cc net/throttle_list.cc - -#protocol -LOCAL_SRC_FILES+=protocol/extensions.cc protocol/handshake.cc protocol/handshake_encryption.cc protocol/handshake_manager.cc protocol/initial_seed.cc protocol/peer_connection_base.cc protocol/peer_connection_leech.cc protocol/peer_connection_metadata.cc protocol/peer_factory.cc protocol/request_list.cc - -# torrent -LOCAL_SRC_FILES+= torrent/bitfield.cc torrent/chunk_manager.cc torrent/connection_manager.cc torrent/dht_manager.cc torrent/download.cc torrent/error.cc torrent/exceptions.cc torrent/hash_string.cc torrent/http.cc torrent/object.cc torrent/object_static_map.cc torrent/object_stream.cc torrent/path.cc torrent/poll_epoll.cc torrent/poll_kqueue.cc torrent/poll_select.cc torrent/rate.cc torrent/resume.cc torrent/thread_base.cc torrent/throttle.cc torrent/torrent.cc torrent/tracker.cc torrent/tracker_list.cc - - -#tracker -LOCAL_SRC_FILES+= tracker/tracker_dht.cc tracker/tracker_http.cc tracker/tracker_manager.cc tracker/tracker_udp.cc - -#utils -LOCAL_SRC_FILES+= utils/diffie_hellman.cc utils/sha_fast.cc - - -LOCAL_STATIC_LIBRARIES := sigc - -include $(BUILD_STATIC_LIBRARY) diff --git a/app/jni/jbcrypto.cpp b/app/jni/jbcrypto.cpp deleted file mode 100644 index 1c3e3ca9..00000000 --- a/app/jni/jbcrypto.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// -// JBCyrpto.cpp -// xcopenvpn -// -// Created by Arne Schwabe on 12.07.12. -// Copyright (c) 2012 Universität Paderborn. All rights reserved. -// - -#include - -#include -#include -#include -#include -#include -#include - - -extern "C" { -jbyteArray Java_se_leap_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_se_leap_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) { - - // EVP_MD_CTX* ctx = reinterpret_cast(ctxRef); - EVP_PKEY* pkey = reinterpret_cast(pkeyRef); - - - if (pkey == NULL || from == NULL) { - jniThrowException(env, "java/lang/NullPointerException", "EVP_KEY is null"); - return NULL; - } - - jbyte* data = env-> GetByteArrayElements (from, NULL); - int datalen = env-> GetArrayLength(from); - - if(data==NULL ) - jniThrowException(env, "java/lang/NullPointerException", "data is null"); - - unsigned int siglen; - unsigned char* sigret = (unsigned char*)malloc(RSA_size(pkey->pkey.rsa)); - - - //int RSA_sign(int type, const unsigned char *m, unsigned int m_len, - // unsigned char *sigret, unsigned int *siglen, RSA *rsa); - - // adapted from s3_clnt.c - if (RSA_sign(NID_md5_sha1, (unsigned char*) data, datalen, - sigret, &siglen, pkey->pkey.rsa) <= 0 ) - { - - jniThrowException(env, "java/security/InvalidKeyException", "rsa_sign went wrong, see logcat"); - - ERR_print_errors_fp(stderr); - return NULL; - - - } - - - jbyteArray jb; - - jb =env->NewByteArray(siglen); - - env->SetByteArrayRegion(jb, 0, siglen, (jbyte *) sigret); - free(sigret); - return jb; - -} diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c deleted file mode 100644 index 143cd10b..00000000 --- a/app/jni/jniglue.c +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include -#include -#include - -#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_se_leap_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jclass jo, jint fd) { - int ret = close(fd); -} - diff --git a/app/jni/jniglue.h b/app/jni/jniglue.h deleted file mode 100644 index a86d52da..00000000 --- a/app/jni/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/app/jni/minivpn.c b/app/jni/minivpn.c deleted file mode 100644 index e69de29b..00000000 diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk deleted file mode 100644 index 51bf1003..00000000 --- a/app/jni/prebuilt.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Build curl - -include $(CLEAR_VARS) -LOCAL_MODULE := curl -LOCAL_SRC_FILES := prebuilt/libcurl.a -LOCAL_PATH = $(CURRENT_DIR) - -include $(PREBUILT_STATIC_LIBRARY) - -# SIGC - -include $(CLEAR_VARS) -LOCAL_MODULE := sigc -LOCAL_SRC_FILES := prebuilt/libsigc.a -LOCAL_PATH = $(CURRENT_DIR) - -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -# Torrent library -LOCAL_MODULE := rtorrent -LOCAL_SRC_FILES := prebuilt/librtorrent.a -LOCAL_PATH = $(CURRENT_DIR) - -LOCAL_STATIC_LIBRARIES := sigc - -include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/jni/Android.mk | 29 ++++++++++++++++ app/jni/Application.mk | 8 +++++ app/jni/buildall.mk | 69 ++++++++++++++++++++++++++++++++++++++ app/jni/jbcrypto.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ app/jni/jniglue.c | 22 ++++++++++++ app/jni/jniglue.h | 12 +++++++ app/jni/minivpn.c | 0 app/jni/prebuilt.mk | 27 +++++++++++++++ 8 files changed, 257 insertions(+) create mode 100644 app/jni/Android.mk create mode 100644 app/jni/Application.mk create mode 100644 app/jni/buildall.mk create mode 100644 app/jni/jbcrypto.cpp create mode 100644 app/jni/jniglue.c create mode 100644 app/jni/jniglue.h create mode 100644 app/jni/minivpn.c create mode 100644 app/jni/prebuilt.mk (limited to 'app/jni') diff --git a/app/jni/Android.mk b/app/jni/Android.mk new file mode 100644 index 00000000..3514b920 --- /dev/null +++ b/app/jni/Android.mk @@ -0,0 +1,29 @@ +# Path of the sources +JNI_DIR := $(call my-dir) + +include lzo/Android.mk + +include openssl/Android.mk + +include openvpn/Android.mk + + +LOCAL_PATH := $(JNI_DIR) + +# The only real JNI library +include $(CLEAR_VARS) +LOCAL_LDLIBS := -llog -lz +LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl +LOCAL_SRC_FILES:= jniglue.c jbcrypto.cpp +LOCAL_MODULE = opvpnutil +LOCAL_SHARED_LIBRARIES := libcrypto +include $(BUILD_SHARED_LIBRARY) + + +include $(CLEAR_VARS) +LOCAL_LDLIBS := -lz -lc +LOCAL_SHARED_LIBRARIES := libssl libcrypto openvpn +LOCAL_SRC_FILES:= minivpn.c +LOCAL_MODULE = minivpn +include $(BUILD_EXECUTABLE) + diff --git a/app/jni/Application.mk b/app/jni/Application.mk new file mode 100644 index 00000000..0795b5b8 --- /dev/null +++ b/app/jni/Application.mk @@ -0,0 +1,8 @@ +APP_ABI := all +NDK_TOOLCHAIN_VERSION=4.8 +APP_PLATFORM := android-14 +APP_STL:=stlport_static + +#APP_OPTIM := release + +#LOCAL_ARM_MODE := arm diff --git a/app/jni/buildall.mk b/app/jni/buildall.mk new file mode 100644 index 00000000..e1d6fdbc --- /dev/null +++ b/app/jni/buildall.mk @@ -0,0 +1,69 @@ +# Build curl +include $(CURRENT_DIR)/curl/Android.mk + + +include $(CLEAR_VARS) + + +# SIGC++ Library built as static library +LOCAL_MODULE := sigc +LOCAL_PATH = $(CURRENT_DIR) +LOCAL_CPP_EXTENSION := .cc + + + +LOCAL_SRC_FILES := sigc++/signal.cc sigc++/signal_base.cc sigc++/trackable.cc +LOCAL_SRC_FILES += sigc++/functors/slot_base.cc sigc++/adaptors/lambda/lambda.cc +LOCAL_SRC_FILES += sigc++/connection.cc sigc++/functors/slot.cc + + +LOCAL_C_INCLUDES := sigc++ + +include $(BUILD_STATIC_LIBRARY) + +# Torrent library + +include $(CLEAR_VARS) + + +LOCAL_PATH := $(CURRENT_DIR)/libtorrent/src +LOCAL_C_INCLUDES := $(CURRENT_DIR)/libtorrent $(CURRENT_DIR) $(CURRENT_DIR)/libtorrent/src $(CURRENT_DIR)/libtorrent/src/torrent +LOCAL_CPP_EXTENSION := .cc +LOCAL_MODULE = rtorrent + +LOCAL_SRC_FILES = globals.cc resource_manager.cc manager.cc + +#torrent subdirs +LOCAL_SRC_FILES+= torrent/data/block.cc torrent/data/block_list.cc torrent/data/chunk_utils.cc torrent/data/file.cc torrent/data/file_list.cc torrent/data/file_list_iterator.cc torrent/data/file_manager.cc torrent/data/file_utils.cc torrent/data/transfer_list.cc torrent/peer/client_info.cc torrent/peer/client_list.cc torrent/peer/connection_list.cc torrent/peer/peer.cc torrent/peer/peer_info.cc torrent/peer/peer_list.cc + + + +#data +LOCAL_SRC_FILES+= data/chunk.cc data/chunk_list.cc data/chunk_part.cc data/hash_chunk.cc data/hash_queue.cc data/hash_queue_node.cc data/hash_torrent.cc data/memory_chunk.cc data/socket_file.cc + +# dht +LOCAL_SRC_FILES+= dht/dht_bucket.cc dht/dht_node.cc dht/dht_router.cc dht/dht_server.cc dht/dht_tracker.cc dht/dht_transaction.cc + +#download +LOCAL_SRC_FILES+= download/available_list.cc download/choke_manager.cc download/chunk_selector.cc download/chunk_statistics.cc download/delegator.cc download/download_constructor.cc download/download_main.cc download/download_manager.cc download/download_wrapper.cc + +# net +LOCAL_SRC_FILES+=net/address_list.cc net/listen.cc net/socket_base.cc net/socket_datagram.cc net/socket_fd.cc net/socket_set.cc net/socket_stream.cc net/throttle_internal.cc net/throttle_list.cc + +#protocol +LOCAL_SRC_FILES+=protocol/extensions.cc protocol/handshake.cc protocol/handshake_encryption.cc protocol/handshake_manager.cc protocol/initial_seed.cc protocol/peer_connection_base.cc protocol/peer_connection_leech.cc protocol/peer_connection_metadata.cc protocol/peer_factory.cc protocol/request_list.cc + +# torrent +LOCAL_SRC_FILES+= torrent/bitfield.cc torrent/chunk_manager.cc torrent/connection_manager.cc torrent/dht_manager.cc torrent/download.cc torrent/error.cc torrent/exceptions.cc torrent/hash_string.cc torrent/http.cc torrent/object.cc torrent/object_static_map.cc torrent/object_stream.cc torrent/path.cc torrent/poll_epoll.cc torrent/poll_kqueue.cc torrent/poll_select.cc torrent/rate.cc torrent/resume.cc torrent/thread_base.cc torrent/throttle.cc torrent/torrent.cc torrent/tracker.cc torrent/tracker_list.cc + + +#tracker +LOCAL_SRC_FILES+= tracker/tracker_dht.cc tracker/tracker_http.cc tracker/tracker_manager.cc tracker/tracker_udp.cc + +#utils +LOCAL_SRC_FILES+= utils/diffie_hellman.cc utils/sha_fast.cc + + +LOCAL_STATIC_LIBRARIES := sigc + +include $(BUILD_STATIC_LIBRARY) diff --git a/app/jni/jbcrypto.cpp b/app/jni/jbcrypto.cpp new file mode 100644 index 00000000..1c3e3ca9 --- /dev/null +++ b/app/jni/jbcrypto.cpp @@ -0,0 +1,90 @@ +// +// JBCyrpto.cpp +// xcopenvpn +// +// Created by Arne Schwabe on 12.07.12. +// Copyright (c) 2012 Universität Paderborn. All rights reserved. +// + +#include + +#include +#include +#include +#include +#include +#include + + +extern "C" { +jbyteArray Java_se_leap_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_se_leap_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) { + + // EVP_MD_CTX* ctx = reinterpret_cast(ctxRef); + EVP_PKEY* pkey = reinterpret_cast(pkeyRef); + + + if (pkey == NULL || from == NULL) { + jniThrowException(env, "java/lang/NullPointerException", "EVP_KEY is null"); + return NULL; + } + + jbyte* data = env-> GetByteArrayElements (from, NULL); + int datalen = env-> GetArrayLength(from); + + if(data==NULL ) + jniThrowException(env, "java/lang/NullPointerException", "data is null"); + + unsigned int siglen; + unsigned char* sigret = (unsigned char*)malloc(RSA_size(pkey->pkey.rsa)); + + + //int RSA_sign(int type, const unsigned char *m, unsigned int m_len, + // unsigned char *sigret, unsigned int *siglen, RSA *rsa); + + // adapted from s3_clnt.c + if (RSA_sign(NID_md5_sha1, (unsigned char*) data, datalen, + sigret, &siglen, pkey->pkey.rsa) <= 0 ) + { + + jniThrowException(env, "java/security/InvalidKeyException", "rsa_sign went wrong, see logcat"); + + ERR_print_errors_fp(stderr); + return NULL; + + + } + + + jbyteArray jb; + + jb =env->NewByteArray(siglen); + + env->SetByteArrayRegion(jb, 0, siglen, (jbyte *) sigret); + free(sigret); + return jb; + +} diff --git a/app/jni/jniglue.c b/app/jni/jniglue.c new file mode 100644 index 00000000..143cd10b --- /dev/null +++ b/app/jni/jniglue.c @@ -0,0 +1,22 @@ +#include +#include +#include +#include + +#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_se_leap_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jclass jo, jint fd) { + int ret = close(fd); +} + diff --git a/app/jni/jniglue.h b/app/jni/jniglue.h new file mode 100644 index 00000000..a86d52da --- /dev/null +++ b/app/jni/jniglue.h @@ -0,0 +1,12 @@ +// +// 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/app/jni/minivpn.c b/app/jni/minivpn.c new file mode 100644 index 00000000..e69de29b diff --git a/app/jni/prebuilt.mk b/app/jni/prebuilt.mk new file mode 100644 index 00000000..51bf1003 --- /dev/null +++ b/app/jni/prebuilt.mk @@ -0,0 +1,27 @@ +# Build curl + +include $(CLEAR_VARS) +LOCAL_MODULE := curl +LOCAL_SRC_FILES := prebuilt/libcurl.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +# SIGC + +include $(CLEAR_VARS) +LOCAL_MODULE := sigc +LOCAL_SRC_FILES := prebuilt/libsigc.a +LOCAL_PATH = $(CURRENT_DIR) + +include $(PREBUILT_STATIC_LIBRARY) + +include $(CLEAR_VARS) +# Torrent library +LOCAL_MODULE := rtorrent +LOCAL_SRC_FILES := prebuilt/librtorrent.a +LOCAL_PATH = $(CURRENT_DIR) + +LOCAL_STATIC_LIBRARIES := sigc + +include $(PREBUILT_STATIC_LIBRARY) -- cgit v1.2.3