mirror of
https://github.com/OpenVPN/openvpn.git
synced 2025-05-09 21:51:05 +08:00
Change include order for tests
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
Gert Doering
parent
91b057a2b5
commit
54475711eb
@ -41,7 +41,7 @@ if HAVE_SITNL
|
||||
check_PROGRAMS += networking_testdriver
|
||||
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_SOURCES = test_argv.c mock_msg.c mock_msg.h \
|
||||
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/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_SOURCES = test_buffer.c mock_msg.c mock_msg.h \
|
||||
mock_get_random.c \
|
||||
$(top_srcdir)/src/openvpn/win32-util.c \
|
||||
$(top_srcdir)/src/openvpn/platform.c
|
||||
|
||||
crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
crypto_testdriver_CFLAGS = \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
|
||||
@TEST_CFLAGS@
|
||||
crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@
|
||||
crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \
|
||||
$(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/mss.c
|
||||
|
||||
ssl_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
ssl_testdriver_CFLAGS = \
|
||||
-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_SOURCES = test_ssl.c mock_msg.c mock_msg.h \
|
||||
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
|
||||
endif
|
||||
|
||||
packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
packet_id_testdriver_CFLAGS = \
|
||||
-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_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \
|
||||
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/session_id.c
|
||||
|
||||
pkt_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
pkt_testdriver_CFLAGS = \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
|
||||
@TEST_CFLAGS@
|
||||
pkt_testdriver_LDFLAGS = @TEST_LDFLAGS@
|
||||
pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h mock_win32_execve.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
|
||||
|
||||
if !WIN32
|
||||
tls_crypt_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
tls_crypt_testdriver_CFLAGS = \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \
|
||||
@TEST_CFLAGS@
|
||||
tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
|
||||
-Wl,--wrap=buffer_read_from_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
|
||||
|
||||
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 \
|
||||
$(OPTIONAL_CRYPTO_CFLAGS)
|
||||
@TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
|
||||
networking_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn \
|
||||
$(OPTIONAL_CRYPTO_LIBS)
|
||||
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
|
||||
endif
|
||||
|
||||
provider_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
provider_testdriver_CFLAGS = \
|
||||
-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@ \
|
||||
$(OPTIONAL_CRYPTO_LIBS)
|
||||
|
||||
@ -196,9 +201,9 @@ provider_testdriver_SOURCES = test_provider.c mock_msg.c \
|
||||
$(top_srcdir)/src/openvpn/platform.c
|
||||
|
||||
if WIN32
|
||||
cryptoapi_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
cryptoapi_testdriver_CFLAGS = \
|
||||
-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@ \
|
||||
$(OPTIONAL_CRYPTO_LIBS) -lcrypt32 -lncrypt
|
||||
cryptoapi_testdriver_SOURCES = test_cryptoapi.c mock_msg.c \
|
||||
@ -214,9 +219,9 @@ endif
|
||||
|
||||
if HAVE_SOFTHSM2
|
||||
if !WIN32
|
||||
pkcs11_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
pkcs11_testdriver_CFLAGS = \
|
||||
-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@ \
|
||||
$(OPTIONAL_CRYPTO_LIBS)
|
||||
pkcs11_testdriver_SOURCES = test_pkcs11.c mock_msg.c \
|
||||
@ -235,9 +240,9 @@ pkcs11_testdriver_SOURCES = test_pkcs11.c mock_msg.c \
|
||||
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 \
|
||||
$(OPTIONAL_CRYPTO_CFLAGS)
|
||||
@TEST_CFLAGS@ $(OPTIONAL_CRYPTO_CFLAGS)
|
||||
auth_token_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
|
||||
$(OPTIONAL_CRYPTO_LIBS)
|
||||
|
||||
@ -253,8 +258,9 @@ auth_token_testdriver_SOURCES = test_auth_token.c mock_msg.c \
|
||||
$(top_srcdir)/src/openvpn/base64.c
|
||||
|
||||
|
||||
user_pass_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn
|
||||
user_pass_testdriver_CFLAGS = \
|
||||
-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_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
|
||||
|
||||
|
||||
ncp_testdriver_CFLAGS = @TEST_CFLAGS@ \
|
||||
ncp_testdriver_CFLAGS = \
|
||||
-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@ \
|
||||
$(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/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 \
|
||||
-DSOURCEDIR=\"$(top_srcdir)\"
|
||||
-DSOURCEDIR=\"$(top_srcdir)\" @TEST_CFLAGS@
|
||||
|
||||
misc_testdriver_LDFLAGS = @TEST_LDFLAGS@
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user