From c639e95aa6cbfffad1f20d8e08418ea5f9232855 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 29 Jan 2017 23:00:37 +0100 Subject: Update openssl --- main/openssl | 2 +- main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/openssl b/main/openssl index fad90f8d..dac310ed 160000 --- a/main/openssl +++ b/main/openssl @@ -1 +1 @@ -Subproject commit fad90f8d2f0d00eea112e261fcaa0eae2ad55a9c +Subproject commit dac310ed06b7c91b8b28c7e433f2b82e2bd4cc60 diff --git a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java index bc03db25..d97dce03 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java +++ b/main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java @@ -21,8 +21,8 @@ import de.blinkt.openvpn.R; import de.blinkt.openvpn.VpnProfile; public class VPNLaunchHelper { - private static final String MININONPIEVPN = "nopie_openvpn"; - private static final String MINIPIEVPN = "pie_openvpn"; + private static final String MININONPIEVPN = "c_nopie_openvpn"; + private static final String MINIPIEVPN = "c_pie_openvpn"; private static final String OVPNCONFIGFILE = "android.conf"; @@ -43,7 +43,7 @@ public class VPNLaunchHelper { for (String abi: abis) { - File vpnExecutable = new File(context.getCacheDir(), "c_" + getMiniVPNExecutableName() + "." + abi); + File vpnExecutable = new File(context.getCacheDir(), getMiniVPNExecutableName() + "." + abi); if ((vpnExecutable.exists() && vpnExecutable.canExecute()) || writeMiniVPNBinary(context, abi, vpnExecutable)) { return vpnExecutable.getPath(); } -- cgit v1.2.3