3888fa7880
Rather than using the clunky, old, slower wireguard-linux-compat out of tree module, this commit does a patch-by-patch backport of upstream's wireguard to 5.4. This specific backport is in widespread use, being part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's Android kernel, Gentoo's distro kernel, and probably more I've forgotten about. It's definately the "more proper" way of adding wireguard to a kernel than the ugly compat.h hell of the wireguard-linux-compat repo. And most importantly for OpenWRT, it allows using the same module configuration code for 5.10 as for 5.4, with no need for bifurcation. These patches are from the backport tree which is maintained in the open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y I'll be sending PRs to update this as needed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From 4517445d7df86d35d348f884a228e6979113d485 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Mon, 2 Nov 2020 14:48:15 +0100
|
|
Subject: [PATCH 067/124] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires
|
|
the manager
|
|
|
|
commit 6569e3097f1c4a490bdf2b23d326855e04942dfd upstream.
|
|
|
|
The extra tests in the manager actually require the manager to be
|
|
selected too. Otherwise the linker gives errors like:
|
|
|
|
ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor':
|
|
chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test'
|
|
|
|
Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled")
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
crypto/Kconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/crypto/Kconfig
|
|
+++ b/crypto/Kconfig
|
|
@@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS
|
|
|
|
config CRYPTO_MANAGER_EXTRA_TESTS
|
|
bool "Enable extra run-time crypto self tests"
|
|
- depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS
|
|
+ depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER
|
|
help
|
|
Enable extra run-time self tests of registered crypto algorithms,
|
|
including randomized fuzz tests.
|