OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 21:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change include order for tests

Browse Source 
Including "ssl.h" conflicts with the wolfSSL ssl.h header file. The openvpn/src directory needs to be included before include/wolfssl. include/wolfssl needs to be included so that openvpn can pick up wolfSSL compatibility headers instead of OpenSSL headers without changing the paths.

src/openvpn/Makefile.am does not need to be modified because AM_CPPFLAGS is placed before AM_CFLAGS in the output Makefile.

Signed-off-by: Juliusz Sosinowicz <juliusz@wolfssl.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20240212132522.125903-1-juliusz@wolfssl.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28229.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Juliusz Sosinowicz 2024-02-12 14:25:22 +01:00 committed by Gert Doering
parent 91b057a2b5
commit 54475711eb
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tests/unit_tests/openvpn/Makefile.am
View File

@ -41,7 +41,7 @@ if HAVE_SITNL
check_PROGRAMS += networking_testdriver check_PROGRAMS += networking_testdriver
endif endif
argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat argv_testdriver_CFLAGS = -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat @TEST_CFLAGS@
argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -Wl,--wrap=parse_line argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -Wl,--wrap=parse_line
argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \ argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \
mock_get_random.c \ mock_get_random.c \
@ -50,15 +50,16 @@ argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \
$(top_srcdir)/src/openvpn/win32-util.c \ $(top_srcdir)/src/openvpn/win32-util.c \
$(top_srcdir)/src/openvpn/argv.c $(top_srcdir)/src/openvpn/argv.c
buffer_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat buffer_testdriver_CFLAGS = -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat @TEST_CFLAGS@
buffer_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -Wl,--wrap=parse_line buffer_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -Wl,--wrap=parse_line
buffer_testdriver_SOURCES = test_buffer.c mock_msg.c mock_msg.h \ buffer_testdriver_SOURCES = test_buffer.c mock_msg.c mock_msg.h \
mock_get_random.c \ mock_get_random.c \
$(top_srcdir)/src/openvpn/win32-util.c \ $(top_srcdir)/src/openvpn/win32-util.c \
$(top_srcdir)/src/openvpn/platform.c $(top_srcdir)/src/openvpn/platform.c
crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \ crypto_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@ crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@
crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \
$(top_srcdir)/src/openvpn/buffer.c \ $(top_srcdir)/src/openvpn/buffer.c \
@ -72,8 +73,9 @@ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \
$(top_srcdir)/src/openvpn/win32-util.c \ $(top_srcdir)/src/openvpn/win32-util.c \
$(top_srcdir)/src/openvpn/mss.c $(top_srcdir)/src/openvpn/mss.c
ssl_testdriver_CFLAGS = @TEST_CFLAGS@ \ ssl_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
ssl_testdriver_LDFLAGS = @TEST_LDFLAGS@ $(OPTIONAL_CRYPTO_LIBS) ssl_testdriver_LDFLAGS = @TEST_LDFLAGS@ $(OPTIONAL_CRYPTO_LIBS)
ssl_testdriver_SOURCES = test_ssl.c mock_msg.c mock_msg.h \ ssl_testdriver_SOURCES = test_ssl.c mock_msg.c mock_msg.h \
mock_management.c mock_ssl_dependencies.c mock_win32_execve.c \ mock_management.c mock_ssl_dependencies.c mock_win32_execve.c \
@ -106,8 +108,9 @@ if WIN32
ssl_testdriver_LDADD = -lcrypt32 -lncrypt -lfwpuclnt -liphlpapi -lws2_32 ssl_testdriver_LDADD = -lcrypt32 -lncrypt -lfwpuclnt -liphlpapi -lws2_32
endif endif
packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ packet_id_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@
packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \ packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \
mock_get_random.c \ mock_get_random.c \
@ -119,8 +122,9 @@ packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \
$(top_srcdir)/src/openvpn/win32-util.c \ $(top_srcdir)/src/openvpn/win32-util.c \
$(top_srcdir)/src/openvpn/session_id.c $(top_srcdir)/src/openvpn/session_id.c
pkt_testdriver_CFLAGS = @TEST_CFLAGS@ \ pkt_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
pkt_testdriver_LDFLAGS = @TEST_LDFLAGS@ pkt_testdriver_LDFLAGS = @TEST_LDFLAGS@
pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h mock_win32_execve.c \ pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h mock_win32_execve.c \
$(top_srcdir)/src/openvpn/argv.c \ $(top_srcdir)/src/openvpn/argv.c \
@ -141,8 +145,9 @@ pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h mock_win32_execve.c \
$(top_srcdir)/src/openvpn/tls_crypt.c $(top_srcdir)/src/openvpn/tls_crypt.c
if !WIN32 if !WIN32
tls_crypt_testdriver_CFLAGS = @TEST_CFLAGS@ \ tls_crypt_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
-Wl,--wrap=buffer_read_from_file \ -Wl,--wrap=buffer_read_from_file \
-Wl,--wrap=buffer_write_file \ -Wl,--wrap=buffer_write_file \
@ -164,9 +169,9 @@ tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \
endif endif
if HAVE_SITNL if HAVE_SITNL
networking_testdriver_CFLAGS = @TEST_CFLAGS@ \ networking_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
networking_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn \ networking_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_LIBS) $(OPTIONAL_CRYPTO_LIBS)
networking_testdriver_SOURCES = test_networking.c mock_msg.c \ networking_testdriver_SOURCES = test_networking.c mock_msg.c \
@ -180,9 +185,9 @@ networking_testdriver_SOURCES = test_networking.c mock_msg.c \
$(top_srcdir)/src/openvpn/platform.c $(top_srcdir)/src/openvpn/platform.c
endif endif
provider_testdriver_CFLAGS = @TEST_CFLAGS@ \ provider_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
provider_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ provider_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
$(OPTIONAL_CRYPTO_LIBS) $(OPTIONAL_CRYPTO_LIBS)
@ -196,9 +201,9 @@ provider_testdriver_SOURCES = test_provider.c mock_msg.c \
$(top_srcdir)/src/openvpn/platform.c $(top_srcdir)/src/openvpn/platform.c
if WIN32 if WIN32
cryptoapi_testdriver_CFLAGS = @TEST_CFLAGS@ \ cryptoapi_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
cryptoapi_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ cryptoapi_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
$(OPTIONAL_CRYPTO_LIBS) -lcrypt32 -lncrypt $(OPTIONAL_CRYPTO_LIBS) -lcrypt32 -lncrypt
cryptoapi_testdriver_SOURCES = test_cryptoapi.c mock_msg.c \ cryptoapi_testdriver_SOURCES = test_cryptoapi.c mock_msg.c \
@ -214,9 +219,9 @@ endif
if HAVE_SOFTHSM2 if HAVE_SOFTHSM2
if !WIN32 if !WIN32
pkcs11_testdriver_CFLAGS = @TEST_CFLAGS@ \ pkcs11_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
pkcs11_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ pkcs11_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
$(OPTIONAL_CRYPTO_LIBS) $(OPTIONAL_CRYPTO_LIBS)
pkcs11_testdriver_SOURCES = test_pkcs11.c mock_msg.c \ pkcs11_testdriver_SOURCES = test_pkcs11.c mock_msg.c \
@ -235,9 +240,9 @@ pkcs11_testdriver_SOURCES = test_pkcs11.c mock_msg.c \
endif endif
endif endif
auth_token_testdriver_CFLAGS = @TEST_CFLAGS@ \ auth_token_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
auth_token_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ auth_token_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
$(OPTIONAL_CRYPTO_LIBS) $(OPTIONAL_CRYPTO_LIBS)
@ -253,8 +258,9 @@ auth_token_testdriver_SOURCES = test_auth_token.c mock_msg.c \
$(top_srcdir)/src/openvpn/base64.c $(top_srcdir)/src/openvpn/base64.c
user_pass_testdriver_CFLAGS = @TEST_CFLAGS@ \ user_pass_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
@TEST_CFLAGS@
user_pass_testdriver_LDFLAGS = @TEST_LDFLAGS@ user_pass_testdriver_LDFLAGS = @TEST_LDFLAGS@
user_pass_testdriver_SOURCES = test_user_pass.c mock_msg.c \ user_pass_testdriver_SOURCES = test_user_pass.c mock_msg.c \
@ -269,9 +275,9 @@ user_pass_testdriver_SOURCES = test_user_pass.c mock_msg.c \
$(top_srcdir)/src/openvpn/base64.c $(top_srcdir)/src/openvpn/base64.c
ncp_testdriver_CFLAGS = @TEST_CFLAGS@ \ ncp_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
$(OPTIONAL_CRYPTO_CFLAGS) @TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
ncp_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ ncp_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
$(OPTIONAL_CRYPTO_LIBS) $(OPTIONAL_CRYPTO_LIBS)
@ -287,9 +293,9 @@ ncp_testdriver_SOURCES = test_ncp.c mock_msg.c \
$(top_srcdir)/src/compat/compat-strsep.c \ $(top_srcdir)/src/compat/compat-strsep.c \
$(top_srcdir)/src/openvpn/ssl_util.c $(top_srcdir)/src/openvpn/ssl_util.c
misc_testdriver_CFLAGS = @TEST_CFLAGS@ \ misc_testdriver_CFLAGS = \
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
-DSOURCEDIR=\"$(top_srcdir)\" -DSOURCEDIR=\"$(top_srcdir)\" @TEST_CFLAGS@
misc_testdriver_LDFLAGS = @TEST_LDFLAGS@ misc_testdriver_LDFLAGS = @TEST_LDFLAGS@