Merge branch 'update_ics-openvpn' into 'master'

update dependencies

Closes #9060

See merge request leap/bitmask_android!161

18 files changed, 5 insertions, 8 deletions

diff --git a/app/assets/fronts b/app/assets/fronts
index 937332df..cd850e2e 100644
--- a/app/assets/fronts
+++ b/app/assets/fronts
@@ -1,6 +1,3 @@
-snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/
-snowflake-front cdn.sstatic.net
-snowflake-stun stun:stun.stunprotocol.org:3478
-moat-cdn https://d50gd378qj74g.cloudfront.net/
-moat-url https://moat.torproject.org.global.prod.fastly.net/
-moat-front cdn.sstatic.net
+snowflake-target https://snowflake-broker.azureedge.net
+snowflake-front ajax.aspnetcdn.com
+snowflake-stun stun:stun.stunprotocol.org:3478,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index a66b7b51..5a1757ac 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -37,7 +37,7 @@ public class NativeUtils {
 
     static {
         if (!isRoboUnitTest() && !isUnitTest()) {
-            System.loadLibrary("opvpnutil");
+            System.loadLibrary("ovpnutil");
             if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN)
                 System.loadLibrary("jbcrypto");
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
index 764d5f06..0b481780 100644
--- a/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
+++ b/app/src/main/java/se/leap/bitmaskclient/tor/ClientTransportPlugin.java
@@ -76,7 +76,7 @@ public class ClientTransportPlugin implements ClientTransportPluginInterface {
         String front = getCdnFront("snowflake-front");
         String stunServer = getCdnFront("snowflake-stun");
         Log.d(TAG, "startSnowflake. target: " + target + ", front:" + front + ", stunServer" + stunServer);
-        snowflakePort = IPtProxy.startSnowflake( stunServer, target, front, logfile.getAbsolutePath(), false, false, true, 5);
+        snowflakePort = IPtProxy.startSnowflake(stunServer, target, front, null, logfile.getAbsolutePath(), false, false, true, 5);
         Log.d(TAG, "startSnowflake running on port: " + snowflakePort);
         watchLogFile(logfile);
     }
diff --git a/bitmaskcore b/bitmaskcore
-Subproject 03f62c02beb53e5b4f91a68245b377bb30344cb
+Subproject 5e5b3ebebc5437e83f3bc5f0afce46b6b4aa465
diff --git a/ics-openvpn b/ics-openvpn
-Subproject f2ca3dc135452ffb733711ba735056bb61a7a67
+Subproject a9dc600d98c2549fd05019449c0990f05717454
diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar
index 903904ed..5b475b1f 100644
--- a/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar
+++ b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar
diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64.aar b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar
index bf1b3fda..5a12115c 100644
--- a/lib-bitmask-core-arm64/bitmaskcore_arm64.aar
+++ b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar
diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar
index 903904ed..5b475b1f 100644
--- a/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar
+++ b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar
diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm.aar b/lib-bitmask-core-armv7/bitmaskcore_arm.aar
index f56b2b2c..d947ed88 100644
--- a/lib-bitmask-core-armv7/bitmaskcore_arm.aar
+++ b/lib-bitmask-core-armv7/bitmaskcore_arm.aar
diff --git a/lib-bitmask-core-web/bitmaskcore_web-sources.jar b/lib-bitmask-core-web/bitmaskcore_web-sources.jar
index 7507016b..9bbe2dff 100644
--- a/lib-bitmask-core-web/bitmaskcore_web-sources.jar
+++ b/lib-bitmask-core-web/bitmaskcore_web-sources.jar
diff --git a/lib-bitmask-core-web/bitmaskcore_web.aar b/lib-bitmask-core-web/bitmaskcore_web.aar
index 154101b3..b5c931d6 100644
--- a/lib-bitmask-core-web/bitmaskcore_web.aar
+++ b/lib-bitmask-core-web/bitmaskcore_web.aar
diff --git a/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar
index 903904ed..5b475b1f 100644
--- a/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar
+++ b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar
diff --git a/lib-bitmask-core-x86/bitmaskcore_x86.aar b/lib-bitmask-core-x86/bitmaskcore_x86.aar
index 64867109..eb0ae963 100644
--- a/lib-bitmask-core-x86/bitmaskcore_x86.aar
+++ b/lib-bitmask-core-x86/bitmaskcore_x86.aar
diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar
index 903904ed..5b475b1f 100644
--- a/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar
+++ b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar
diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar
index 6579fa2f..7f428f45 100644
--- a/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar
+++ b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar
diff --git a/lib-bitmask-core/bitmaskcore-sources.jar b/lib-bitmask-core/bitmaskcore-sources.jar
index 903904ed..5b475b1f 100644
--- a/lib-bitmask-core/bitmaskcore-sources.jar
+++ b/lib-bitmask-core/bitmaskcore-sources.jar
diff --git a/lib-bitmask-core/bitmaskcore.aar b/lib-bitmask-core/bitmaskcore.aar
index 19da0b2a..fe28f633 100644
--- a/lib-bitmask-core/bitmaskcore.aar
+++ b/lib-bitmask-core/bitmaskcore.aar
diff --git a/tor-android b/tor-android
-Subproject 9603bf9a78f9f621a06bb527d182bbdd0f4cf35
+Subproject 2ba958276d8dbbdfd5a003ed9423a2a74e643de