From c206a91d320995f37f8abb33188bfd384249da3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 7 Apr 2014 20:43:34 +0200 Subject: Next step: compile jni sources correctly. --- jni/Android.mk | 33 -------------------- jni/Application.mk | 8 ----- jni/buildall.mk | 69 ----------------------------------------- jni/jbcrypto.cpp | 90 ------------------------------------------------------ jni/jniglue.c | 22 ------------- jni/jniglue.h | 12 -------- jni/minivpn.c | 0 jni/prebuilt.mk | 27 ---------------- 8 files changed, 261 deletions(-) delete mode 100644 jni/Android.mk delete mode 100644 jni/Application.mk delete mode 100644 jni/buildall.mk delete mode 100644 jni/jbcrypto.cpp delete mode 100644 jni/jniglue.c delete mode 100644 jni/jniglue.h delete mode 100644 jni/minivpn.c delete mode 100644 jni/prebuilt.mk (limited to 'jni') diff --git a/jni/Android.mk b/jni/Android.mk deleted file mode 100644 index 283be302..00000000 --- a/jni/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Path of the sources -JNI_DIR := $(call my-dir) - -include lzo/Android.mk - -include openssl/Android.mk - -ifneq ($(TARGET_ARCH),mips) -include google-breakpad/android/google_breakpad/Android.mk -endif - -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/jni/Application.mk b/jni/Application.mk deleted file mode 100644 index 0795b5b8..00000000 --- a/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/jni/buildall.mk b/jni/buildall.mk deleted file mode 100644 index e1d6fdbc..00000000 --- a/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/jni/jbcrypto.cpp b/jni/jbcrypto.cpp deleted file mode 100644 index 1c3e3ca9..00000000 --- a/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/jni/jniglue.c b/jni/jniglue.c deleted file mode 100644 index 143cd10b..00000000 --- a/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/jni/jniglue.h b/jni/jniglue.h deleted file mode 100644 index a86d52da..00000000 --- a/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/jni/minivpn.c b/jni/minivpn.c deleted file mode 100644 index e69de29b..00000000 diff --git a/jni/prebuilt.mk b/jni/prebuilt.mk deleted file mode 100644 index 51bf1003..00000000 --- a/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