From 02d27a843f29a03028bb427473008ee657059855 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 1 Oct 2021 15:10:58 +0200
Subject: Update OPenSSL to 3.0 and OpenVPN to current master

---
 main/src/main/cpp/CMakeLists.txt          | 4 ++--
 main/src/main/cpp/openssl                 | 2 +-
 main/src/main/cpp/openvpn                 | 2 +-
 main/src/main/cpp/openvpn-config/config.h | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'main/src')

diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 4057b4e2..7034c0c0 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -7,7 +7,6 @@ git_describe(OPENVPN3_GIT "${CMAKE_CURRENT_SOURCE_DIR}/openvpn3" "--tags" "--alw
 message("OpenVPN 2.x version ${OPENVPN2_GIT}")
 message("OpenVPN 3.x version ${OPENVPN3_GIT}")
 
-
 # Set mbedtls options
 OPTION(ENABLE_PROGRAMS "" OFF)
 OPTION(USE_SHARED_MBEDTLS_LIBRARY "" OFF)
@@ -166,7 +165,6 @@ set(openvpn_srcs
         src/openvpn/otime.c
         src/openvpn/packet_id.c
         src/openvpn/perf.c
-        src/openvpn/pf.c
         src/openvpn/ping.c
         src/openvpn/pkcs11.c
         src/openvpn/pkcs11_openssl.c
@@ -198,6 +196,8 @@ set(openvpn_srcs
         src/openvpn/tls_crypt.c
         src/openvpn/tun.c
         src/openvpn/vlan.c
+        #src/openvpn/xkey_helper.c
+        #src/openvpn/xkey_provider.c
         src/openvpn/comp-lz4.c
         src/openvpn/comp.c
         src/openvpn/compstub.c
diff --git a/main/src/main/cpp/openssl b/main/src/main/cpp/openssl
index de9b2f25..c1525c16 160000
--- a/main/src/main/cpp/openssl
+++ b/main/src/main/cpp/openssl
@@ -1 +1 @@
-Subproject commit de9b2f2598e497366af99b538633afc80b365792
+Subproject commit c1525c164ee2e3f400c8063bcc6591db8db4e704
diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn
index 0c4b34fe..4a9cbd88 160000
--- a/main/src/main/cpp/openvpn
+++ b/main/src/main/cpp/openvpn
@@ -1 +1 @@
-Subproject commit 0c4b34feb23df5c819ad54d6c2374030f7845a72
+Subproject commit 4a9cbd8875c7de335899e070dfaa50f06e01c1a8
diff --git a/main/src/main/cpp/openvpn-config/config.h b/main/src/main/cpp/openvpn-config/config.h
index 7959c147..69ed58d3 100644
--- a/main/src/main/cpp/openvpn-config/config.h
+++ b/main/src/main/cpp/openvpn-config/config.h
@@ -681,4 +681,6 @@ int res_init();
 #define HAVE_EVP_CIPHER_CTX_RESET
 
 
-#define _SOCKLEN_T_DECLARED 1
\ No newline at end of file
+#define _SOCKLEN_T_DECLARED 1
+
+//#define HAVE_XKEY_PROVIDER 1
\ No newline at end of file
-- 
cgit v1.2.3