diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-02-07 23:40:38 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-02-07 23:40:38 +0100 |
| commit | 811436bea4925a657ce8a986c64513f76a5f2aa5 (patch) | |
| tree | 3d1f879c07e3a249444d68c9614ea64a74b8a5e8 /jni | |
| parent | b6386e685176add87a06943d34bf01d8cd1dbea4 (diff) | |
First working version of OpenVPN 3 Core (still much left to do
--HG--
branch : ovpn3
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 2 | ||||
| -rw-r--r-- | jni/Application.mk | 3 | ||||
| -rw-r--r-- | jni/jbcrypto.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 283be302..4cc1d173 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -10,7 +10,7 @@ include google-breakpad/android/google_breakpad/Android.mk endif include openvpn/Android.mk - +include ovpn3/Android.mk LOCAL_PATH := $(JNI_DIR) diff --git a/jni/Application.mk b/jni/Application.mk index 5670b6e3..a9657a19 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,7 +1,8 @@ APP_ABI := all NDK_TOOLCHAIN_VERSION=4.4.3 #APP_PLATFORM := android-14 -APP_STL:=stlport_static +#APP_STL:=stlport_static +APP_STL:=gnustl_static #APP_OPTIM := release diff --git a/jni/jbcrypto.cpp b/jni/jbcrypto.cpp index 8bc6fb8d..77382fb9 100644 --- a/jni/jbcrypto.cpp +++ b/jni/jbcrypto.cpp @@ -17,7 +17,7 @@ extern "C" { -jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef); +jbyteArray Java_de_blinkt_openvpn_VpnProfile_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef); } int jniThrowException(JNIEnv* env, const char* className, const char* msg) { @@ -41,7 +41,7 @@ int jniThrowException(JNIEnv* env, const char* className, const char* msg) { } -jbyteArray Java_de_blinkt_openvpn_OpenVpnManagementThread_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) { +jbyteArray Java_de_blinkt_openvpn_VpnProfile_rsasign(JNIEnv* env, jclass, jbyteArray from, jint pkeyRef) { // EVP_MD_CTX* ctx = reinterpret_cast<EVP_MD_CTX*>(ctxRef); EVP_PKEY* pkey = reinterpret_cast<EVP_PKEY*>(pkeyRef); |