summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2020-09-11 11:26:06 +0200
committerArne Schwabe <arne@rfc2549.org>2020-09-11 11:29:55 +0200
commit3abeb389bf62bcbedd668e3ee661249c7748cc16 (patch)
treea28b2728e197855cfaae1a50dd25bff354953e29
parent1bad88978b00d5dd5f87eab61cf1dc6feff49528 (diff)
Enable V2 signing, update openvpn/oepnvpn3
-rw-r--r--main/build.gradle.kts6
m---------main/src/main/cpp/openvpn0
m---------main/src/main/cpp/openvpn30
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java1
4 files changed, 4 insertions, 3 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 999555c3..5ff96745 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -18,8 +18,8 @@ android {
defaultConfig {
minSdkVersion(14)
targetSdkVersion(30) //'Q'.toInt()
- versionCode = 171
- versionName = "0.7.17a"
+ versionCode = 172
+ versionName = "0.7.18"
externalNativeBuild {
cmake {
@@ -69,6 +69,8 @@ android {
keyPassword = keystoreAliasPassword
val keystoreAlias: String? by project
keyAlias = keystoreAlias
+ isV1SigningEnabled = true
+ isV2SigningEnabled = true
}
}
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject 25004b074ae416b13ecba9aa895b450a3a2d59c
+Subproject e824dfb872d36b5a2047d29422405be1b75fad6
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject ab6fc3d8de10bc4cc3803a9aea4c04447860dca
+Subproject 9c577420c3dcc94c8682b70d9d1dd7795c152a2
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 2ddd4ce2..c250dc5e 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -34,7 +34,6 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
private OpenVPNService mService;
public OpenVPNThreadv3(OpenVPNService openVpnService, VpnProfile vp) {
- init_process();
mVp = vp;
mService = openVpnService;
}