From patchwork Mon Feb 12 13:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliusz Sosinowicz X-Patchwork-Id: 3613 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:e8a8:b0:554:adf7:68e6 with SMTP id oz40csp2382414mab; Mon, 12 Feb 2024 05:26:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVskEXfZLB5FehM04/Rvc9xDl02U1Wl17t/gv8EN1iPXWpEZb8U1KTT8cj3lnYsQj4orXaKRPFKdm+CFc6QtEPCfoyYjZc= X-Google-Smtp-Source: AGHT+IGn1SALOXELckt/P8FoY0YA8bQ5E1cXTDbkRMmFl8xPEGlsIIrROVw0TrMFj/sjfvsilwJE X-Received: by 2002:a17:903:2303:b0:1d9:9c61:55f2 with SMTP id d3-20020a170903230300b001d99c6155f2mr8029952plh.2.1707744361025; Mon, 12 Feb 2024 05:26:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707744361; cv=none; d=google.com; s=arc-20160816; b=B4cLlH9ZwI6bQ8RVq8kKRYgtRslk98sq8JtdQa+8qH18IfyzyJB6MR3MzIJOZNMrN9 VxJYeTc1hEqCNuDNWpUxcLD2+DsnH2L2nM0xS/rxrEHdhfsM1CzLz98jPmLaz4RaUXdS uT+vkJbKJsRMLoSSSBwc6V1wdZTb1OQ3QnTbuTYP8uiLnVuJWNIjxsc6VDrxroswLvK3 3j+7F7fEBCNxsXGLUDUzhsGOMXHLepEx2hXwtVdn9yunIOrVj37mY/U0916XcrqR5xRP xs6AE+MRcJ5axH5osIW/X3XykznyAGM8VLir5V8+Gx78sdDZnhjPIv3vn5De7vsWnuVs e7hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=hDMyUUTWnKXXsOSMRq8QeGPRjc6kLsfBZlPO82cYdsY=; fh=r2Q5LJK24gmE2MxXpUX7x7fAjlcZ46ljBRau8HX5yWo=; b=rDaL9/2Ev8npvF6c7OWv++6m51j5vCTFr/BZBfyS/Ts+EPoNdp0Uty+j3pa0eCpzNC VqnINWAFzJq3w72JnY4JSwUtpPbrG+kQGjKzg73hcTAydkA0xvfjO3Yun98PPSUpvqRM rTqlqHTKd4oB5tJuxL68srNqZ8QMMjjux2WBzcKku0T1ciqA4vd+V5FTF/CdsfYtsWNZ Pk8p+HNCHxXB/mRkNeUS0VXzHFClRrqoHUODWYOX2gEHhiO9cbfb/LZFXnU16TDOfD9M 6aLaDK2kMRZ0M4o8hYQOXP8P11XsLccVrQ5tXxFYPM0tjdAgtPa5QPodGn+W62vMwc59 3W6g==; darn=openvpn.net ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="Ba3eI/GU"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="hT4A/Oo3"; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=bEphYhQS; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wolfssl.com X-Forwarded-Encrypted: i=1; AJvYcCXQJJnyEGD7JARvSEPIgt6NWy8vubFA8QS9qXPNvzYaj+bhOPOLt7eIJY8eXZkS+dG/kkw+0f4U9HPZNi6MxfR4HxbTboka8Wajb3d4Fz7Vlvk5RADrzDrDXHnABlOqz5CM1ePuD6XjhiIsC0YDME49WQve8Sw= Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id lk7-20020a17090308c700b001da2a3e4c55si251867plb.216.2024.02.12.05.26.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2024 05:26:01 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="Ba3eI/GU"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="hT4A/Oo3"; dkim=neutral (body hash did not verify) header.i=@wolfssl-com.20230601.gappssmtp.com header.s=20230601 header.b=bEphYhQS; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wolfssl.com Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rZWJY-0000w6-Ff; Mon, 12 Feb 2024 13:25:41 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rZWJW-0000vz-Pg for openvpn-devel@lists.sourceforge.net; Mon, 12 Feb 2024 13:25:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Y0kgZSBJCfSZ0G7kPpMCXabXO4r4c5aBuWT+LrwJJkM=; b=Ba3eI/GUxc3MVZRFRj36MyFR3o +uQIUFunAo9Tlx58pcNX88HLLCwbOjlr0BgYP7ScKcn3+Wcwm3sDzdSmX0iVFODsMD7tUbCrPQ0j0 frK2r/Jjf2huFSoS49qf7/UeyTuiU+dnZm7vEPPWQ02iWIkSYmt55I51bUdKbX3Mswfk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=Y0kgZSBJCfSZ0G7kPpMCXabXO4r4c5aBuWT+LrwJJkM=; b=h T4A/Oo3V8XZOTBj4SfVVVB+0A5yaVj8JcqwZM0NrZCoI6MKIve3LOdUzgdl/rNafQ49wx8EFoVdlI h7DKWat+ac46tCWB4DN3tCmrqBwgrsAG9PpHMeMySpGujXGwOPNeMFuLFrnSNFKTz8TalM9/gko9V 2f/4j5o+nMSpyvI8=; Received: from mail-lf1-f68.google.com ([209.85.167.68]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rZWJV-0004Bq-8N for openvpn-devel@lists.sourceforge.net; Mon, 12 Feb 2024 13:25:38 +0000 Received: by mail-lf1-f68.google.com with SMTP id 2adb3069b0e04-511531f03f6so3688256e87.0 for ; Mon, 12 Feb 2024 05:25:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfssl-com.20230601.gappssmtp.com; s=20230601; t=1707744326; x=1708349126; darn=lists.sourceforge.net; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y0kgZSBJCfSZ0G7kPpMCXabXO4r4c5aBuWT+LrwJJkM=; b=bEphYhQSIKA0GLnJUXyVIfzHTQIBVGMkLOznE0eO3Y/v5Av9bJe4xQN0sIkdf0F6vh IqlhRyeNCG5McGgDkwVKzokuzVhO80VAmmmEEkS/uVyT4ziRVxlv0XYPINkNjir6bgAa 7QV+v5tdOXxY2Av46J+Mkwrgx9USIXcVNsQsNvEEcEvL7exU/hc197K1QIuIfBWdfH3Q LOsolP1Yb8+YzwAX92fjUTKwhW9kCxdVS3zdntm/bUMEwIUy7aL7W+WhIkAsLrZXsQeZ YZ78Kr4DXDBfxAtts3kMaRro24SIdTXKLe8x6wXGq1/akO9UYAwLlEmFgIydOfeWDjYn o1Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707744326; x=1708349126; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y0kgZSBJCfSZ0G7kPpMCXabXO4r4c5aBuWT+LrwJJkM=; b=eAffDWRAS+FuYAID/BIuMOeHyEyK4CJ5LuyV22myZI42dWj+22JhdBldANVK4I2wJm cRNxqc+sXrQFcC2Q927A/phgJZk93ccV5iDM9RCibAYX0Z2diSCUIUNHARmSUeJdLoiV hr6VqOXzJgSLj9uw6esNzIgnotkwdigBhniLx8B34UKq9qyFxWRSjarWrRr4V/Gzyegr u75DGxMkW1+/z8Ikyl/FgFrEUy2BeY0DcspW3MudE7p8D0z1MBbJytCWhrpnv7E/EBft p0QFszH3rQ7kR4GDH91mwhAgw7v5n7QVMDPfOopTqOceDIzqmUf2BCZMq4hajqRqvy1C WzeQ== X-Gm-Message-State: AOJu0YyyvJ+4rRBNFC+rPM14RQE94CzbKmlhTc5z53ir2qQDKk3AZ4k9 HXj6LIhfDG4b7wvCpdPor4Em4GWOlPqG4qFCe5XuBQRa3Gt289ch2dyjdx2qIV6mR0eqqUHBQHI AQTsGOnzQ X-Received: by 2002:ac2:41c9:0:b0:511:8669:b0c5 with SMTP id d9-20020ac241c9000000b005118669b0c5mr3557114lfi.39.1707744325758; Mon, 12 Feb 2024 05:25:25 -0800 (PST) Received: from localhost.localdomain ([85.203.44.56]) by smtp.gmail.com with ESMTPSA id c17-20020ac25f71000000b0051181cbea91sm818726lfc.228.2024.02.12.05.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 05:25:25 -0800 (PST) From: Juliusz Sosinowicz To: openvpn-devel@lists.sourceforge.net Date: Mon, 12 Feb 2024 14:25:22 +0100 Message-Id: <20240212132522.125903-1-juliusz@wolfssl.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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 [...] Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.68 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.68 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rZWJV-0004Bq-8N Subject: [Openvpn-devel] [PATCH] Change include order for tests X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1790699751476765332?= X-GMAIL-MSGID: =?utf-8?q?1790699751476765332?= 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 Acked-By: Arne Schwabe --- tests/unit_tests/openvpn/Makefile.am | 62 +++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index ce6f8127..a4e6235f 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -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@