9 files changed, 16 insertions, 19 deletions
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 5347d049..fae64f33 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.4.1)
+project("ics-openvpn")
 # Git version string
 
 include(GetGitRevisionDescription.cmake)
@@ -92,7 +93,7 @@ include(openssl/openssl.cmake)
  #           -DHAVE_LZ4
  #           -DASIO_STANDALONE
  #           -DUSE_ASIO
- #           -DGIT_VERSION_STRING=\"${OPENVPN3_GIT}\"
+ #           -DOPENVPN_CORE_GIT_VERSION=\"${OPENVPN3_GIT}\"
  #           -DOPENVPN_SHOW_SESSION_TOKEN
  #           -DOPENSSL_API_COMPAT=0x10200000L
  #           -DOPENVPN_ALLOW_INSECURE_CERTPROFILE
@@ -109,8 +110,8 @@ target_compile_definitions(ovpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
         )
 target_link_libraries(ovpnutil log)
 
-#add_library(rsapss SHARED ovpnutil/rsapss.cpp)
-#target_link_libraries(rsapss log crypto ssl)
+#add_library(osslutil SHARED ovpnutil/osslutil.cpp)
+#target_link_libraries(osslutil log crypto ssl)
 
 #if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
 #    message("Building SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
@@ -167,6 +168,7 @@ set(openvpn_srcs
         src/openvpn/occ.c
         src/openvpn/openvpn.c
         src/openvpn/options.c
+        src/openvpn/options_util.c
         src/openvpn/otime.c
         src/openvpn/packet_id.c
         src/openvpn/perf.c
@@ -180,6 +182,7 @@ set(openvpn_srcs
         src/openvpn/proxy.c
         src/openvpn/ps.c
         src/openvpn/push.c
+        src/openvpn/reflect_filter.c
         src/openvpn/reliable.c
         src/openvpn/route.c
         src/openvpn/run_command.c
diff --git a/main/src/main/cpp/asio b/main/src/main/cpp/asio
-Subproject 4915cfd8a1653c157a1480162ae5601318553eb
+Subproject 1f8d154829b902dbc45a651587c6c6df948358e
diff --git a/main/src/main/cpp/lz4 b/main/src/main/cpp/lz4
-Subproject d44371841a2f1728a3f36839fd4b7e872d0927d
+Subproject 5ff839680134437dbf4678f3d0c7b371d84f496
diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
-Subproject 5a6a7d0c955b168ccaecbd16d5a8ae4d20304ff
+Subproject bf2a6facba08b980a00f2f2c4e46487471b17f6
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject 7e5f410745eeda7d08d83445429ecd70035b730
+Subproject a80f21b133ebf10bc3c36577fedef024c6ed303
diff --git a/main/src/main/cpp/openvpn-config/config.h b/main/src/main/cpp/openvpn-config/config.h
index ca33c91e..989e439a 100644
--- a/main/src/main/cpp/openvpn-config/config.h
+++ b/main/src/main/cpp/openvpn-config/config.h
@@ -21,27 +21,15 @@
 /* Use dmalloc memory debugging library */
 /* #undef DMALLOC */
 
-/* Dimension to use for empty array declaration */
-#define EMPTY_ARRAY_SIZE 0
-
-/* Enable client capability only */
-#define ENABLE_CLIENT_ONLY 1
-
 /* Enable debugging support */
 #define ENABLE_DEBUG 1
 
 /* Enable internal fragmentation support */
 #define ENABLE_FRAGMENT 1
 
-/* Enable HTTP proxy support */
-#define ENABLE_HTTP_PROXY 1
-
 /* Enable management server capability */
 #define ENABLE_MANAGEMENT 1
 
-/* Enable multi-homed UDP server capability */
-#define ENABLE_MULTIHOME 0
-
 /* Allow --askpass and --auth-user-pass passwords to be read from a file */
 #define ENABLE_PASSWORD_SAVE 1
 
@@ -450,13 +438,13 @@
 #define PACKAGE_NAME "OpenVPN"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenVPN 2.6-icsopenvpn"
+#define PACKAGE_STRING "OpenVPN 2.7-icsopenvpn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openvpn"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6_master"
+#define PACKAGE_VERSION "2.7_master"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject a6296185ec5d6f604ed2c66a3e1c81ff99e387f
+Subproject f159710100e1442c7354b4f24cbfe742abc8c89
diff --git a/main/src/main/cpp/ovpnutil/jniglue.c b/main/src/main/cpp/ovpnutil/jniglue.c
index 65a13406..b70deac0 100644
--- a/main/src/main/cpp/ovpnutil/jniglue.c
+++ b/main/src/main/cpp/ovpnutil/jniglue.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-
 #include "jniglue.h"
 
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
@@ -37,4 +36,4 @@ jstring Java_de_blinkt_openvpn_core_NativeUtils_getOpenVPN3GitVersion(JNIEnv *en
 {
 
   return (*env)->NewStringUTF(env, OPENVPN3_GIT_REVISION);
-}
+}
+\ No newline at end of file
diff --git a/main/src/main/cpp/ovpnutil/rsapss.cpp b/main/src/main/cpp/ovpnutil/osslutil.cpp
index 112c2fe4..6a33338e 100644
--- a/main/src/main/cpp/ovpnutil/rsapss.cpp
+++ b/main/src/main/cpp/ovpnutil/osslutil.cpp
@@ -13,9 +13,16 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
+#include <openssl/opensslv.h>
 
 #include <array>
 
+
+extern "C" jstring Java_de_blinkt_openvpn_core_NativeUtils_getOpenSSLVersionString(JNIEnv *env, jclass jo)
+{
+  return env->NewStringUTF(OPENSSL_VERSION_TEXT);
+}
+
 static const unsigned char zeroes[] = {0, 0, 0, 0, 0, 0, 0, 0};
 
 static char opensslerr[1024];