summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2024-07-23 15:00:57 +0200
committerArne Schwabe <arne@rfc2549.org>2024-07-23 15:02:45 +0200
commitaae95613927ad80794bb5683208172aa6269bd23 (patch)
tree5f99b9b3c4e934f874904180574d29ed1ba5a9a4
parent879ed38be52fbc1d7079ced9c31756c7635a1fa1 (diff)
Update version of OpenSSL, OpenVPN 2/3, Asio and many libraries
-rw-r--r--gradle/libs.versions.toml26
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
m---------main/src/main/cpp/asio0
m---------main/src/main/cpp/openssl0
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
7 files changed, 14 insertions, 15 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7f841712..9dffd27a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +1,27 @@
[versions]
-android-gradle-plugin = "8.1.4"
-androidx-annotation = "1.7.0"
-androidx-appcompat = "1.6.1"
-android-view-material = "1.10.0"
-androidx-core-ktx = "1.12.0"
-androidx-fragment-ktx = "1.6.2"
+android-gradle-plugin = "8.3.2"
+androidx-annotation = "1.8.0"
+androidx-appcompat = "1.7.0"
+android-view-material = "1.12.0"
+androidx-core-ktx = "1.13.1"
+androidx-fragment-ktx = "1.8.1"
androidx-preference-ktx = "1.2.1"
-androidx-webkit = "1.9.0"
-androidx-lifecycle-viewmodel-ktx = "2.6.2"
-androidx-lifecycle-runtime-ktx = "2.6.2"
+androidx-webkit = "1.11.0"
+androidx-lifecycle-viewmodel-ktx = "2.8.3"
+androidx-lifecycle-runtime-ktx = "2.8.3"
androidx-security-crypto = "1.1.0-alpha06"
androidx-constraintlayout = "2.1.4"
androidx-cardview = "1.0.0"
androidx-recyclerview = "1.3.2"
-bouncycastle = "1.67"
+bouncycastle = "1.69"
mpandroidchart = "v3.1.0"
-kotlin = "1.9.0"
+kotlin = "1.9.20"
square-okhttp = "4.10.0"
# Test
-androidx-test-core = "1.5.0"
+androidx-test-core = "1.6.1"
junit = "4.13.2"
-mockito-core = "3.9.0"
+mockito-core = "4.8.1"
robolectric = "4.10.2"
[libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 06fe19dc..e59ea7ea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/main/src/main/cpp/asio b/main/src/main/cpp/asio
-Subproject 1f8d154829b902dbc45a651587c6c6df948358e
+Subproject 12e0ce9e0500bf0f247dbd1ae89427265645607
diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
-Subproject 479b1b83891105c382cacdf71aeb35c14e99421
+Subproject bbc7c1c11fbd0eb47e3d2ee46c9986ce16b3e8a
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject 0ad449769ee88fe19fb23a0714639f98eba7708
+Subproject 99788b64e6aa82c32aa39915c441e0b3b916454
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject 7f2e42ce0ba6651f6549146f641f1e4c196059a
+Subproject 13d6b06e1c03174000f0a7bdfdcfb680e19f4cb
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 ad7a7c28..4f8e33a6 100644
--- a/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ui/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -262,7 +262,6 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
void setUserPW() {
if (mVp.isUserPWAuth()) {
ClientAPI_ProvideCreds creds = new ClientAPI_ProvideCreds();
- creds.setCachePassword(true);
creds.setPassword(mVp.getPasswordAuth());
creds.setUsername(mVp.mUsername);
provide_creds(creds);