Browse code

Fix mbedtls unit tests

Commit 674b166 ("Fix build warnings related to get_random()") broke the
unit tests for mbedtls, because <mbedtls/cipher.h> was now included via
platform.c -> crypto.h -> crypto_backend.h, but the crypto cflags were
not included for that unit tests.

Since we got rid of --disable-crypto, we can now fix this by simply always
including the CRYPTO_CFLAGS in the TEST_CFLAGS (and the CRYPTO_LIBS in the
TEST_LDFLAGS). This should not only fix this occurrence, but also prevent
similar problems in the future.

Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>

Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1539153883-15789-1-git-send-email-steffan.karger@fox-it.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17687.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Steffan Karger authored on 2018/10/10 15:44:43
Showing 2 changed files
... ...
@@ -1360,8 +1360,8 @@ AC_SUBST([VENDOR_SRC_ROOT])
1360 1360
 AC_SUBST([VENDOR_BUILD_ROOT])
1361 1361
 AC_SUBST([VENDOR_DIST_ROOT])
1362 1362
 
1363
-TEST_LDFLAGS="-lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
1364
-TEST_CFLAGS="-I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
1363
+TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_LIBS} -lcmocka -L\$(abs_top_builddir)/vendor/dist/lib -Wl,-rpath,\$(abs_top_builddir)/vendor/dist/lib"
1364
+TEST_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${OPTIONAL_PKCS11_CFLAGS} -I\$(top_srcdir)/include -I\$(abs_top_builddir)/vendor/dist/include"
1365 1365
 
1366 1366
 AC_SUBST([TEST_LDFLAGS])
1367 1367
 AC_SUBST([TEST_CFLAGS])
... ...
@@ -14,10 +14,8 @@ openvpn_includedir = $(top_srcdir)/include
14 14
 openvpn_srcdir = $(top_srcdir)/src/openvpn
15 15
 compat_srcdir = $(top_srcdir)/src/compat
16 16
 
17
-argv_testdriver_CFLAGS  = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) \
18
-	$(OPTIONAL_CRYPTO_CFLAGS)
19
-argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line \
20
-	$(OPTIONAL_CRYPTO_LIBS)
17
+argv_testdriver_CFLAGS  = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir)
18
+argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line
21 19
 argv_testdriver_SOURCES = test_argv.c mock_msg.c \
22 20
 	mock_get_random.c \
23 21
 	$(openvpn_srcdir)/platform.c \
... ...
@@ -31,10 +29,8 @@ buffer_testdriver_SOURCES = test_buffer.c mock_msg.c \
31 31
 	$(openvpn_srcdir)/platform.c
32 32
 
33 33
 crypto_testdriver_CFLAGS  = @TEST_CFLAGS@ \
34
-	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
35
-	$(OPTIONAL_CRYPTO_CFLAGS)
36
-crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
37
-	$(OPTIONAL_CRYPTO_LIBS)
34
+	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir)
35
+crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@
38 36
 crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \
39 37
 	$(openvpn_srcdir)/buffer.c \
40 38
 	$(openvpn_srcdir)/crypto.c \
... ...
@@ -45,10 +41,8 @@ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \
45 45
 	$(openvpn_srcdir)/platform.c
46 46
 
47 47
 packet_id_testdriver_CFLAGS  = @TEST_CFLAGS@ \
48
-	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
49
-	$(OPTIONAL_CRYPTO_CFLAGS)
50
-packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
51
-	$(OPTIONAL_CRYPTO_LIBS)
48
+	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir)
49
+packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@
52 50
 packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c \
53 51
 	mock_get_random.c \
54 52
 	$(openvpn_srcdir)/buffer.c \
... ...
@@ -57,10 +51,8 @@ packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c \
57 57
 	$(openvpn_srcdir)/platform.c
58 58
 
59 59
 tls_crypt_testdriver_CFLAGS  = @TEST_CFLAGS@ \
60
-	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \
61
-	$(OPTIONAL_CRYPTO_CFLAGS)
62
-tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \
63
-	$(OPTIONAL_CRYPTO_LIBS)
60
+	-I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir)
61
+tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@
64 62
 tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c \
65 63
 	$(openvpn_srcdir)/base64.c \
66 64
 	$(openvpn_srcdir)/buffer.c \