From f07066d047562f1fae9618ffc5af1f940d733967 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 14 Dec 2022 13:51:10 +0100
Subject: Update OpenVPN 2 and 3

This changes the OpenVPN version number to 2.7 since we branched off
2.6 from master.
---
 main/src/main/cpp/openvpn                                |  2 +-
 main/src/main/cpp/openvpn-config/config.h                | 16 ++--------------
 main/src/main/cpp/openvpn3                               |  2 +-
 .../ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java  |  2 ++
 4 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'main')

diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
index 8434109b..d861a123 160000
--- a/main/src/main/cpp/openvpn
+++ b/main/src/main/cpp/openvpn
@@ -1 +1 @@
-Subproject commit 8434109b172a5863492009fb9a3190307daf308c
+Subproject commit d861a123bb592b07d9c8f97ea2d033d08d9430ee
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
index 907b8aa6..ed321315 160000
--- a/main/src/main/cpp/openvpn3
+++ b/main/src/main/cpp/openvpn3
@@ -1 +1 @@
-Subproject commit 907b8aa6c9b1338cb3dacbd1efee667b5f598ee0
+Subproject commit ed32131597ecd7ed8330dcd64c76d995bf3decff
diff --git a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 75093e14..ad7a7c28 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -189,12 +189,14 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
         config.setExternalPkiAlias("extpki");
         config.setCompressionMode("asym");
 
+
         config.setHwAddrOverride(NetworkUtils.getFakeMacAddrFromSAAID(mService));
         config.setInfo(true);
         config.setAllowLocalLanAccess(mVp.mAllowLocalLAN);
         boolean retryOnAuthFailed = mVp.mAuthRetry == AUTH_RETRY_NOINTERACT;
         config.setRetryOnAuthFailed(retryOnAuthFailed);
         config.setEnableLegacyAlgorithms(mVp.mUseLegacyProvider);
+        /* We want the same app internal route emulation for OpenVPN 2 and OpenVPN 3 */
         config.setEnableRouteEmulation(false);
         if (mVp.mCompatMode > 0 && mVp.mCompatMode < 20500)
             config.setEnableNonPreferredDCAlgorithms(true);
-- 
cgit v1.2.3