diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2019-10-28 14:46:19 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2019-10-28 14:46:19 +0100 |
| commit | 484053aa9d291a35b349af69123e2c28d4f254fe (patch) | |
| tree | 1e174d8b52fd81bf204068b0761b43dc8d506f22 /main | |
| parent | 638fed55948d9ebb2792d84f7039d3392629e37d (diff) | |
Update OpenVPN/OpenSSL
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/cpp/CMakeLists.txt | 1 | ||||
| m--------- | main/src/main/cpp/openssl | 0 | ||||
| m--------- | main/src/main/cpp/openvpn | 0 | ||||
| -rw-r--r-- | main/src/main/cpp/openvpn-config/config.h | 6 |
4 files changed, 4 insertions, 3 deletions
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 -Subproject 84faa84d5b7981e93fe7c995115ff9b525f13e2 +Subproject 3d84d35cb7cb0775fbed54ffb4eaef38b0eba7a diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn -Subproject 980ad594a39776d912fb2e2e758b255c58bfb27 +Subproject 5493c5fa82dd300aae89f228ff7ba8144b54c68 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 |