From 3cc9dfb875e579cc5d08c1c697ccc414ef98f215 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 3 May 2016 10:40:21 +0200 Subject: Fix minor warnings --- main/src/main/java/de/blinkt/openvpn/VpnProfile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java index 11656ee3..31a52ec0 100644 --- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java +++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java @@ -272,7 +272,7 @@ public class VpnProfile implements Serializable, Cloneable { if (!configForOvpn3) { cfg += String.format("setenv IV_GUI_VER %s \n", openVpnEscape(getVersionEnvString(context))); - String versionString = String.format("%d %s %s %s %s %s", Build.VERSION.SDK_INT, Build.VERSION.RELEASE, + String versionString = String.format(Locale.US, "%d %s %s %s %s %s", Build.VERSION.SDK_INT, Build.VERSION.RELEASE, NativeUtils.getNativeAPI(), Build.BRAND, Build.BOARD, Build.MODEL); cfg += String.format("setenv IV_PLAT_VER %s\n", openVpnEscape(versionString)); } @@ -450,7 +450,7 @@ public class VpnProfile implements Serializable, Cloneable { if (mMssFix != 0) { if (mMssFix != 1450) { - cfg += String.format("mssfix %d\n", mMssFix, Locale.US); + cfg += String.format(Locale.US, "mssfix %d\n", mMssFix); } else cfg += "mssfix\n"; } -- cgit v1.2.3 From 8e84c38a3e650af61cd2548d931ed617e4af0069 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 3 May 2016 18:03:21 +0200 Subject: Update OpenSSL --- main/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/openssl b/main/openssl index f6da7c53..c4feda0b 160000 --- a/main/openssl +++ b/main/openssl @@ -1 +1 @@ -Subproject commit f6da7c53fd01990e8e039dbfd5e9ea87e50d1d44 +Subproject commit c4feda0b636aa397cf4e731d3aef91948c3fc2b4 -- cgit v1.2.3