Version 0.7.62 - Update OpenVPN, OpenSSL, OpenVPN 3.x, NDK

Author: schwabe

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "main/src/main/cpp/lz4"]
 	path = main/src/main/cpp/lz4
 	url = ../../lz4/lz4.git
+[submodule "main/src/main/cpp/fmt"]
+	path = main/src/main/cpp/fmt
+	url = https://github.com/fmtlib/fmt

main/build.gradle.kts

@@ -21,14 +21,14 @@ android {
     //compileSdkPreview = "UpsideDownCake"
 
     // Also update runcoverity.sh
-    ndkVersion = "28.2.13676358"
+    ndkVersion = "29.0.14206865"
 
     defaultConfig {
         minSdk = 21
         targetSdk = 36
         //targetSdkPreview = "UpsideDownCake"
-        versionCode = 216
-        versionName = "0.7.61"
+        versionCode = 217
+        versionName = "0.7.62"
         externalNativeBuild {
             cmake {
                 //arguments+= "-DCMAKE_VERBOSE_MAKEFILE=1"

main/src/main/cpp/CMakeLists.txt

@@ -30,6 +30,7 @@ include(tools.cmake)
 include(lzo.cmake)
 include(lz4.cmake)
 include(openssl/openssl.cmake)
+add_subdirectory(fmt)
 
 if(NOT ${OPENVPN3OSSL} OR ${OPENVPN2MBED})
     add_subdirectory(mbedtls)
@@ -80,12 +81,12 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
         target_compile_definitions(ovpn3 PRIVATE
                 -DUSE_OPENSSL
                 )
-        target_link_libraries(ovpn3 crypto ssl lzo lz4)
+        target_link_libraries(ovpn3 crypto ssl lzo lz4 fmt)
     else ()
         target_compile_definitions(ovpn3 PRIVATE
                 -DUSE_MBEDTLS
                 )
-        target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo lz4)
+        target_link_libraries(ovpn3 mbedtls mbedx509 mbedcrypto lzo lz4 fmt)
     endif ()
 
     target_compile_definitions(ovpn3 PRIVATE
@@ -170,6 +171,7 @@ set(openvpn_srcs
         src/openvpn/occ.c
         src/openvpn/openvpn.c
         src/openvpn/options.c
+        src/openvpn/options_parse.c
         src/openvpn/options_util.c
         src/openvpn/otime.c
         src/openvpn/packet_id.c
@@ -184,6 +186,7 @@ set(openvpn_srcs
         src/openvpn/proxy.c
         src/openvpn/ps.c
         src/openvpn/push.c
+        src/openvpn/push_util.c
         src/openvpn/reflect_filter.c
         src/openvpn/reliable.c
         src/openvpn/route.c
@@ -193,6 +196,7 @@ set(openvpn_srcs
         src/openvpn/shaper.c
         src/openvpn/sig.c
         src/openvpn/socket.c
+        src/openvpn/socket_util.c
         src/openvpn/socks.c
         src/openvpn/ssl.c
         src/openvpn/ssl_openssl.c
@@ -234,6 +238,7 @@ target_compile_definitions(openvpn PRIVATE
         -DCONFIGURE_GIT_FLAGS=\"\"
         -DTARGET_ABI=\"${ANDROID_ABI}\"
         -DOPENSSL_API_COMPAT=0x11000000L
+        -DDEFAULT_DNS_UPDOWN=\"/not/supported/on/android\"
         )
 
 if (${OPENVPN2MBED})