From 3ab9e38d4473a7a34b820d80cc442ba6c3e30564 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 15 Jul 2012 16:16:57 +0200
Subject: Add support for Certificates from Keystore under Jelly Beans (Thanks
Kenny Root for the right pointers) Move jniglue/minivpn files to more
sensitive places
--HG--
rename : openvpn/src/openvpn/jniglue.c => jni/jniglue.c
rename : openvpn/src/openvpn/jniglue.h => jni/jniglue.h
rename : openvpn/src/openvpn/testmain.c => jni/minivpn.c
---
openvpn/src/openvpn/jniglue.c | 21 ---------------------
openvpn/src/openvpn/jniglue.h | 12 ------------
openvpn/src/openvpn/testmain.c | 0
3 files changed, 33 deletions(-)
delete mode 100644 openvpn/src/openvpn/jniglue.c
delete mode 100644 openvpn/src/openvpn/jniglue.h
delete mode 100644 openvpn/src/openvpn/testmain.c
(limited to 'openvpn/src')
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
--
cgit v1.2.3