From f7865e2e7862a22c5762dbc8df53c98fb27d5440 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 5 May 2016 13:20:37 +0200
Subject: Update OpenVPN

---
 main/jni/Android.mk | 14 +++++++-------
 main/openvpn        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index c61db83e..fed2bdea 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -2,9 +2,9 @@
 JNI_DIR := $(call my-dir)
 
 #optional arguments
-#WITH_POLAR=1
+#WITH_MBEDTLS=1
 #WITH_OPENVPN3=1
-# Build openvpn with polar (OpenVPN3 core is always build with polar)
+# Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS)
 #WITH_BREAKPAD=0
 
 
@@ -25,15 +25,15 @@ else
 	WITH_BREAKPAD=0
 endif
 
-ifeq ($(WITH_POLAR),1)
-	USE_POLAR=1
+ifeq ($(WITH_MBEDTLS),1)
+	USE_MBEDTLS=1
 endif
 ifeq ($(WITH_OPENVPN3),1)
-	USE_POLAR=1
+	USE_MBEDTLS=1
 endif
 
-ifeq ($(USE_POLAR),1)
-	include polarssl/Android.mk
+ifeq ($(USE_MBEDTLS),1)
+	include mbedtls/Android.mk
 endif
 
 include openvpn/Android.mk
diff --git a/main/openvpn b/main/openvpn
index 049858bb..a7bf6fce 160000
--- a/main/openvpn
+++ b/main/openvpn
@@ -1 +1 @@
-Subproject commit 049858bb44a04f3a52395b523a262f9c9b7dd51a
+Subproject commit a7bf6fceeae8646888e8f64a9c36222fd987e5cd
-- 
cgit v1.2.3