diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2021-03-12 15:59:02 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2021-03-12 16:00:27 +0100 |
| commit | 9979418e5391ae783dbc596038d2623159daaf4a (patch) | |
| tree | 5915d221cffb90911bc466c9b8fc6007a5d1eda6 /main/src | |
| parent | 3bc7b0bf5d072479413471211d85ed3e5b51bab8 (diff) | |
Update OpenVPN 2.x and OpenVPN 3.x
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 1 | ||||
| m--------- | main/src/main/cpp/asio | 0 | ||||
| m--------- | main/src/main/cpp/openvpn | 0 | ||||
| -rw-r--r-- | main/src/main/cpp/openvpn-config/openvpn-plugin.h | 31 | ||||
| m--------- | main/src/main/cpp/openvpn3 | 0 |
5 files changed, 18 insertions, 14 deletions
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 -Subproject a5c5077e44c451ddc8a50c3717e66dcccc92b07 +Subproject b84e6c16b2ea907dbad94206b7510d85aafc0b4 diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn -Subproject 46ce6652c0c9e41482873dd10ca135186424fa1 +Subproject 9b79d2c525fa35457b44a30bb769fdaeaeff191 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 -Subproject 9c577420c3dcc94c8682b70d9d1dd7795c152a2 +Subproject 0d2b080134a8b577250b0ac53f259df4ab0a504 |