diff options
author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:30:24 -0600 |
---|---|---|
committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:30:24 -0600 |
commit | f49967fb3f24bf0a22d09b5823bd174a45e758f7 (patch) | |
tree | 7fefe9ec3aeff998c5dd99861428717a2c5f3a41 /jni | |
parent | 8dbb4517b07c42c3b37b0764d63973b5b1ed5ee6 (diff) | |
parent | b69c9a87f60e649221c8f83d58bbd57b35a64aca (diff) |
Merge branch 'release-0.2.0'0.2.0
Diffstat (limited to 'jni')
-rw-r--r-- | jni/jbcrypto.cpp | 4 | ||||
-rw-r--r-- | jni/jniglue.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jni/jbcrypto.cpp b/jni/jbcrypto.cpp index 8bc6fb8d..1c3e3ca9 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_se_leap_openvpn_OpenVpnManagementThread_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_se_leap_openvpn_OpenVpnManagementThread_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); diff --git a/jni/jniglue.c b/jni/jniglue.c index 82b54d16..143cd10b 100644 --- a/jni/jniglue.c +++ b/jni/jniglue.c @@ -16,7 +16,7 @@ void android_openvpn_log(int level,const char* prefix,const char* prefix_sep,con __android_log_print(ANDROID_LOG_DEBUG,"openvpn","%s%s%s",prefix,prefix_sep,m1); } -void Java_de_blinkt_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jclass jo, jint fd) { +void Java_se_leap_openvpn_OpenVpnManagementThread_jniclose(JNIEnv *env,jclass jo, jint fd) { int ret = close(fd); } |