From 1a13af33256b570025004a6fee0853df75ee1212 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 11 May 2017 16:18:32 +0200
Subject: Version 0.6.66 CVE-2017-7478 and CVE-2017-7479

---
 main/build.gradle       | 4 ++--
 main/jni/Android.mk     | 4 ++--
 main/jni/Application.mk | 6 +++---
 main/openvpn            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/build.gradle b/main/build.gradle
index 52f9900f..f842dc13 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode = 146
-        versionName = "0.6.65"
+        versionCode = 147
+        versionName = "0.6.66"
     }
 
     sourceSets {
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 0b8a2ee4..75c05bdc 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -52,14 +52,14 @@ LOCAL_PATH := $(JNI_DIR)
 # The only real JNI libraries
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -llog  -lz
-LOCAL_CFLAGS = --std=c99 -DTARGET_ARCH_ABI=\"${TARGET_ARCH_ABI}\"
+LOCAL_CFLAGS =  -DTARGET_ARCH_ABI=\"${TARGET_ARCH_ABI}\"
 LOCAL_SRC_FILES:= jniglue.c  scan_ifs.c
 LOCAL_MODULE = opvpnutil
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_LDLIBS := -llog  -lz
-LOCAL_CFLAGS = --std=c99
+LOCAL_CFLAGS = 
 LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl
 LOCAL_SRC_FILES:=  jbcrypto.cpp
 LOCAL_MODULE = jbcrypto
diff --git a/main/jni/Application.mk b/main/jni/Application.mk
index 9495a77a..c38403a4 100644
--- a/main/jni/Application.mk
+++ b/main/jni/Application.mk
@@ -1,8 +1,8 @@
-APP_ABI := arm64-v8a armeabi armeabi-v7a mips  x86 x86_64
+APP_ABI := arm64-v8a armeabi armeabi-v7a x86 x86_64
 APP_PLATFORM := android-14
 
-APP_STL:=stlport_static
-#APP_STL:=gnustl_shared
+#APP_STL:=stlport_static
+APP_STL:=c++_static
 
 
 #APP_OPTIM := release
diff --git a/main/openvpn b/main/openvpn
index 5711c5bd..a3a71dc0 160000
--- a/main/openvpn
+++ b/main/openvpn
@@ -1 +1 @@
-Subproject commit 5711c5bd3a04f48b16cbee96fe1d3d32cdab4621
+Subproject commit a3a71dc0a66045597091c531c4a3576c446a176e
-- 
cgit v1.2.3