From 484053aa9d291a35b349af69123e2c28d4f254fe Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 28 Oct 2019 14:46:19 +0100 Subject: Update OpenVPN/OpenSSL --- main/src/main/cpp/CMakeLists.txt | 1 + main/src/main/cpp/openssl | 2 +- main/src/main/cpp/openvpn | 2 +- main/src/main/cpp/openvpn-config/config.h | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt index 609c38f1..655c8aad 100644 --- a/main/src/main/cpp/CMakeLists.txt +++ b/main/src/main/cpp/CMakeLists.txt @@ -127,6 +127,7 @@ set(openvpn_srcs src/compat/compat-inet_pton.c src/compat/compat-lz4.c src/openvpn/argv.c + src/openvpn/auth_token.c src/openvpn/base64.c src/openvpn/buffer.c src/openvpn/clinat.c diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl index 84faa84d..3d84d35c 160000 --- a/main/src/main/cpp/openssl +++ b/main/src/main/cpp/openssl @@ -1 +1 @@ -Subproject commit 84faa84d5b7981e93fe7c995115ff9b525f13e2d +Subproject commit 3d84d35cb7cb0775fbed54ffb4eaef38b0eba7af diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn index 980ad594..5493c5fa 160000 --- a/main/src/main/cpp/openvpn +++ b/main/src/main/cpp/openvpn @@ -1 +1 @@ -Subproject commit 980ad594a39776d912fb2e2e758b255c58bfb27a +Subproject commit 5493c5fa82dd300aae89f228ff7ba8144b54c687 diff --git a/main/src/main/cpp/openvpn-config/config.h b/main/src/main/cpp/openvpn-config/config.h index 700e0912..7959c147 100644 --- a/main/src/main/cpp/openvpn-config/config.h +++ b/main/src/main/cpp/openvpn-config/config.h @@ -27,9 +27,6 @@ /* Enable client capability only */ #define ENABLE_CLIENT_ONLY 1 -/* Enable client/server capability */ -#define ENABLE_CLIENT_SERVER 1 - /* Enable debugging support */ #define ENABLE_DEBUG 1 @@ -682,3 +679,6 @@ int res_init(); #define HAVE_OPENSSL_VERSION 1 #define HAVE_EVP_CIPHER_CTX_RESET + + +#define _SOCKLEN_T_DECLARED 1 \ No newline at end of file -- cgit v1.2.3