From 9aee9b529a67cbc03dc10f9484d915b3440a2e81 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 8 Oct 2025 20:35:43 +0200
Subject: Version 0.7.62 - Update OpenVPN, OpenSSL, OpenVPN 3.x, NDK

---
 main/src/main/cpp/CMakeLists.txt | 9 +++++++--
 main/src/main/cpp/fmt            | 1 +
 main/src/main/cpp/openssl        | 2 +-
 main/src/main/cpp/openvpn        | 2 +-
 main/src/main/cpp/openvpn3       | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 160000 main/src/main/cpp/fmt

(limited to 'main/src')

diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 39570842..98e0f58e 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/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})
diff --git a/main/src/main/cpp/fmt b/main/src/main/cpp/fmt
new file mode 160000
index 00000000..47a18b2f
--- /dev/null
+++ b/main/src/main/cpp/fmt
@@ -0,0 +1 @@
+Subproject commit 47a18b2fe98557590f35055a93d1932f7466d4db
diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
index 29343663..5a004ee8 160000
--- a/main/src/main/cpp/openssl
+++ b/main/src/main/cpp/openssl
@@ -1 +1 @@
-Subproject commit 29343663996ebebf9657fac104c703df8a2da515
+Subproject commit 5a004ee8dbcb164a18b98d719e4012bbde2d4aff
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
index c5888a12..9d048946 160000
--- a/main/src/main/cpp/openvpn
+++ b/main/src/main/cpp/openvpn
@@ -1 +1 @@
-Subproject commit c5888a12571b4bf3a52bd1cc135d964a4f758c9e
+Subproject commit 9d0489465dd2c42453232587b977e75477b56f8c
diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3
index e43f5fb4..c263e9d7 160000
--- a/main/src/main/cpp/openvpn3
+++ b/main/src/main/cpp/openvpn3
@@ -1 +1 @@
-Subproject commit e43f5fb468633faea6d3e87cebe384118a8aa652
+Subproject commit c263e9d7b75f5d4fadc16b15e82cf1d808a92553
-- 
cgit v1.2.3