From 80c4a9660f9c345a3bc7e52ad7440cede0ad18fe Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 13 Jan 2022 01:51:29 +0100 Subject: Import new OpenVPN 3 version --- main/src/main/cpp/openvpn3 | 2 +- main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 index 7f48cd0d..dba03183 160000 --- a/main/src/main/cpp/openvpn3 +++ b/main/src/main/cpp/openvpn3 @@ -1 +1 @@ -Subproject commit 7f48cd0db1ab1cf514740f2b51d1bb5bd4988a0c +Subproject commit dba03183ce638d57a1ec22f1ef3b2e80749c8982 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 3c197b25..adcf94fd 100644 --- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java +++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java @@ -47,12 +47,9 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable return; setUserPW(); - - VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.platform()); VpnStatus.logInfo(ClientAPI_OpenVPNClientHelper.copyright()); - StatusPoller statuspoller = new StatusPoller(OpenVPNManagement.mBytecountInterval * 1000); new Thread(statuspoller, "Status Poller").start(); @@ -60,9 +57,8 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable if (status.getError()) { VpnStatus.logError(String.format("connect() error: %s: %s", status.getStatus(), status.getMessage())); VpnStatus.addExtraHints(status.getMessage()); - } else { - VpnStatus.updateStateString("NOPROCESS", "OpenVPN3 thread finished", R.string.state_noprocess, ConnectionStatus.LEVEL_NOTCONNECTED); } + VpnStatus.updateStateString("NOPROCESS", "OpenVPN3 thread finished", R.string.state_noprocess, ConnectionStatus.LEVEL_NOTCONNECTED); statuspoller.stop(); } @@ -190,7 +186,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable config.setRetryOnAuthFailed(retryOnAuthFailed); config.setEnableLegacyAlgorithms(mVp.mUseLegacyProvider); if (mVp.mCompatMode > 0 && mVp.mCompatMode < 20500) - config.setEnableNonPreferredDCOAlgorithms(true); + config.setEnableNonPreferredDCAlgorithms(true); if (!TextUtils.isEmpty(mVp.mTlSCertProfile)) config.setTlsCertProfileOverride(mVp.mTlSCertProfile); -- cgit v1.2.3