From 9979418e5391ae783dbc596038d2623159daaf4a Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 12 Mar 2021 15:59:02 +0100 Subject: Update OpenVPN 2.x and OpenVPN 3.x --- main/src/main/cpp/CMakeLists.txt | 1 + main/src/main/cpp/asio | 2 +- main/src/main/cpp/openvpn | 2 +- main/src/main/cpp/openvpn-config/openvpn-plugin.h | 31 +++++++++++++---------- main/src/main/cpp/openvpn3 | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) (limited to 'main') diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index bfd06fba..52c38113 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -193,6 +193,7 @@ set(openvpn_srcs src/openvpn/ssl_openssl.c src/openvpn/ssl_mbedtls.c src/openvpn/ssl_ncp.c + src/openvpn/ssl_util.c src/openvpn/ssl_verify.c src/openvpn/ssl_verify_openssl.c src/openvpn/ssl_verify_mbedtls.c diff --git a/main/src/main/cpp/asio b/main/src/main/cpp/asio index a5c5077e..b84e6c16 160000 --- a/main/src/main/cpp/asio +++ b/main/src/main/cpp/asio @@ -1 +1 @@ -Subproject commit a5c5077e44c451ddc8a50c3717e66dcccc92b074 +Subproject commit b84e6c16b2ea907dbad94206b7510d85aafc0b42 diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn index 46ce6652..9b79d2c5 160000 --- a/main/src/main/cpp/openvpn +++ b/main/src/main/cpp/openvpn @@ -1 +1 @@ -Subproject commit 46ce6652c0c9e41482873dd10ca135186424fa10 +Subproject commit 9b79d2c525fa35457b44a30bb769fdaeaeff1912 diff --git a/main/src/main/cpp/openvpn-config/openvpn-plugin.h b/main/src/main/cpp/openvpn-config/openvpn-plugin.h index 92cb6540..83d22d4b 100644 --- a/main/src/main/cpp/openvpn-config/openvpn-plugin.h +++ b/main/src/main/cpp/openvpn-config/openvpn-plugin.h @@ -117,20 +117,23 @@ extern "C" { * FUNC: openvpn_plugin_client_destructor_v1 (top-level "generic" client) * FUNC: openvpn_plugin_close_v1 */ -#define OPENVPN_PLUGIN_UP 0 -#define OPENVPN_PLUGIN_DOWN 1 -#define OPENVPN_PLUGIN_ROUTE_UP 2 -#define OPENVPN_PLUGIN_IPCHANGE 3 -#define OPENVPN_PLUGIN_TLS_VERIFY 4 -#define OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY 5 -#define OPENVPN_PLUGIN_CLIENT_CONNECT 6 -#define OPENVPN_PLUGIN_CLIENT_DISCONNECT 7 -#define OPENVPN_PLUGIN_LEARN_ADDRESS 8 -#define OPENVPN_PLUGIN_CLIENT_CONNECT_V2 9 -#define OPENVPN_PLUGIN_TLS_FINAL 10 -#define OPENVPN_PLUGIN_ENABLE_PF 11 -#define OPENVPN_PLUGIN_ROUTE_PREDOWN 12 -#define OPENVPN_PLUGIN_N 13 +#define OPENVPN_PLUGIN_UP 0 +#define OPENVPN_PLUGIN_DOWN 1 +#define OPENVPN_PLUGIN_ROUTE_UP 2 +#define OPENVPN_PLUGIN_IPCHANGE 3 +#define OPENVPN_PLUGIN_TLS_VERIFY 4 +#define OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY 5 +#define OPENVPN_PLUGIN_CLIENT_CONNECT 6 +#define OPENVPN_PLUGIN_CLIENT_DISCONNECT 7 +#define OPENVPN_PLUGIN_LEARN_ADDRESS 8 +#define OPENVPN_PLUGIN_CLIENT_CONNECT_V2 9 +#define OPENVPN_PLUGIN_TLS_FINAL 10 +#define OPENVPN_PLUGIN_ENABLE_PF 11 +#define OPENVPN_PLUGIN_ROUTE_PREDOWN 12 +#define OPENVPN_PLUGIN_CLIENT_CONNECT_DEFER 13 +#define OPENVPN_PLUGIN_CLIENT_CONNECT_DEFER_V2 14 +#define OPENVPN_PLUGIN_CLIENT_CRRESPONSE 15 +#define OPENVPN_PLUGIN_N 16 /* * Build a mask out of a set of plug-in types. diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 index 9c577420..0d2b0801 160000 --- a/main/src/main/cpp/openvpn3 +++ b/main/src/main/cpp/openvpn3 @@ -1 +1 @@ -Subproject commit 9c577420c3dcc94c8682b70d9d1dd7795c152a27 +Subproject commit 0d2b080134a8b577250b0ac53f259df4ab0a504a -- cgit v1.2.3