Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
selftests: ovpn: allow compiling ovpn-cli.c with mbedtls3
mbedtls 3 installs headers and calls the shared object
differently than version 2, therefore we must now rely
on pkgconfig to fill the right C/LDFLAGS.
Moreover the mbedtls3 library expects any base64 file to
have their content on one line.
Since this change does no break older versions,
let's change the sample key file format and make mbedtls3
happy.
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Cc: horms@kernel.org
Signed-off-by: Antonio Quartulli <antonio@openvpn.net>
+13
-11
+12
-6
tools/testing/selftests/net/ovpn/Makefile
+12
-6
tools/testing/selftests/net/ovpn/Makefile
···
2
2
# Copyright (C) 2020-2025 OpenVPN, Inc.
3
3
#
4
4
CFLAGS = -pedantic -Wextra -Wall -Wl,--no-as-needed -g -O0 -ggdb $(KHDR_INCLUDES)
5
+
CFLAGS += $(shell pkg-config --cflags mbedcrypto-3 mbedtls-3 2>/dev/null)
6
+
5
7
VAR_CFLAGS = $(shell pkg-config --cflags libnl-3.0 libnl-genl-3.0 2>/dev/null)
6
8
ifeq ($(VAR_CFLAGS),)
7
9
VAR_CFLAGS = -I/usr/include/libnl3
8
10
endif
9
11
CFLAGS += $(VAR_CFLAGS)
10
12
11
-
12
-
LDLIBS = -lmbedtls -lmbedcrypto
13
-
VAR_LDLIBS = $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0 2>/dev/null)
14
-
ifeq ($(VAR_LDLIBS),)
15
-
VAR_LDLIBS = -lnl-genl-3 -lnl-3
13
+
MTLS_LDLIBS= $(shell pkg-config --libs mbedcrypto-3 mbedtls-3 2>/dev/null)
14
+
ifeq ($(MTLS_LDLIBS),)
15
+
MTLS_LDLIBS = -lmbedtls -lmbedcrypto
16
16
endif
17
-
LDLIBS += $(VAR_LDLIBS)
17
+
LDLIBS += $(MTLS_LDLIBS)
18
+
19
+
NL_LDLIBS = $(shell pkg-config --libs libnl-3.0 libnl-genl-3.0 2>/dev/null)
20
+
ifeq ($(NL_LDLIBS),)
21
+
NL_LDLIBS = -lnl-genl-3 -lnl-3
22
+
endif
23
+
LDLIBS += $(NL_LDLIBS)
18
24
19
25
20
26
TEST_FILES = common.sh
+1
-5
tools/testing/selftests/net/ovpn/data64.key
+1
-5
tools/testing/selftests/net/ovpn/data64.key
···
1
-
jRqMACN7d7/aFQNT8S7jkrBD8uwrgHbG5OQZP2eu4R1Y7tfpS2bf5RHv06Vi163CGoaIiTX99R3B
2
-
ia9ycAH8Wz1+9PWv51dnBLur9jbShlgZ2QHLtUc4a/gfT7zZwULXuuxdLnvR21DDeMBaTbkgbai9
3
-
uvAa7ne1liIgGFzbv+Bas4HDVrygxIxuAnP5Qgc3648IJkZ0QEXPF+O9f0n5+QIvGCxkAUVx+5K6
4
-
KIs+SoeWXnAopELmoGSjUpFtJbagXK82HfdqpuUxT2Tnuef0/14SzVE/vNleBNu2ZbyrSAaah8tE
5
-
BofkPJUBFY+YQcfZNM5Dgrw3i+Bpmpq/gpdg5w==
1
+
jRqMACN7d7/aFQNT8S7jkrBD8uwrgHbG5OQZP2eu4R1Y7tfpS2bf5RHv06Vi163CGoaIiTX99R3Bia9ycAH8Wz1+9PWv51dnBLur9jbShlgZ2QHLtUc4a/gfT7zZwULXuuxdLnvR21DDeMBaTbkgbai9uvAa7ne1liIgGFzbv+Bas4HDVrygxIxuAnP5Qgc3648IJkZ0QEXPF+O9f0n5+QIvGCxkAUVx+5K6KIs+SoeWXnAopELmoGSjUpFtJbagXK82HfdqpuUxT2Tnuef0/14SzVE/vNleBNu2ZbyrSAaah8tEBofkPJUBFY+YQcfZNM5Dgrw3i+Bpmpq/gpdg5w==