summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2022-09-03 23:43:17 +0200
committerArne Schwabe <arne@rfc2549.org>2022-09-03 23:43:17 +0200
commitb999ccfeaaccd0d0fd5c52341128325aeeecb37c (patch)
tree6b5bbbe9eeab3443d390aafe709ad74453ae93d2
parent203e6f179b39bc83f3af8c363122d225fa98d125 (diff)
Update OpenVPN 2/3 versions
-rw-r--r--build.gradle.kts2
-rw-r--r--main/src/main/cpp/CMakeLists.txt2
m---------main/src/main/cpp/openvpn0
m---------main/src/main/cpp/openvpn30
4 files changed, 2 insertions, 2 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index a855bbc9..2e04fda7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath("com.android.tools.build:gradle:7.2.1")
+ classpath("com.android.tools.build:gradle:7.2.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 37c5bd82..3ffdc4c2 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -92,7 +92,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
-DHAVE_LZ4
-DASIO_STANDALONE
-DUSE_ASIO
- -DGIT_VERSION_STRING=\"${OPENVPN3_GIT}\"
+ -DOPENVPN_CORE_GIT_VERSION=\"${OPENVPN3_GIT}\"
-DOPENVPN_SHOW_SESSION_TOKEN
-DOPENSSL_API_COMPAT=0x10200000L
-DOPENVPN_ALLOW_INSECURE_CERTPROFILE
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
-Subproject b1ae59746c150da85aa93c8e0ac1e8a0e670d6e
+Subproject 28cb5982db1e83a74af2dc087b69975992f5920
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
-Subproject 2288b479e90adc972e2d0069394eb36e8ec3f14
+Subproject db71df2380e4ecb8a71c0c1fcc2cec94e3520ae