From e436c963f0976b885a7db04681344779e26dd3b5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 23 Apr 2014 09:56:37 +0200
Subject: Update OpenSSL to 1.0.1g and statically link OpenVPN with it

---
 main/openvpn/Android.mk       | 5 +++--
 main/openvpn/config-version.h | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'main/openvpn')

diff --git a/main/openvpn/Android.mk b/main/openvpn/Android.mk
index f3224201..6dfe6777 100644
--- a/main/openvpn/Android.mk
+++ b/main/openvpn/Android.mk
@@ -6,7 +6,7 @@ LOCAL_LDLIBS := -lz
 LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include google-breakpad/src google-breakpad/src/common/android/include polarssl/include snappy
 
 
-#LOCAL_STATIC_LIBRARIES :=  libssl_static libcrypto_static  liblzo-static
+
 
 LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\"
 LOCAL_STATIC_LIBRARIES :=  liblzo-static snappy-static
@@ -15,7 +15,8 @@ ifeq ($(WITH_POLAR),1)
 LOCAL_STATIC_LIBRARIES +=  polarssl-static
 LOCAL_CFLAGS += -DENABLE_CRYPTO_POLARSSL=1
 else
-LOCAL_SHARED_LIBRARIES :=  libssl libcrypto 
+#LOCAL_SHARED_LIBRARIES :=  libssl libcrypto 
+LOCAL_STATIC_LIBRARIES +=  libssl_static libcrypto_static  
 LOCAL_CFLAGS += -DENABLE_CRYPTO_OPENSSL=1
 endif
 
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index 60276cd8..81c6a94c 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_612-757f9467b41fb40e"
-#define CONFIGURE_GIT_FLAGS "+"
+#define CONFIGURE_GIT_REVISION "icsopenvpn_612-a611f0041a0e3548"
+#define CONFIGURE_GIT_FLAGS ""
-- 
cgit v1.2.3