diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-19 08:04:26 -0800 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2021-02-26 20:41:01 +0100 |
| commit | 3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d (patch) | |
| tree | 725dcb6f20bb3999d184eeb27afec8373b8d9e5e | |
| parent | 3888fa78802354ab7bbd19b7d061fd80a16ce06b (diff) | |
| download | upstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.tar.gz upstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.tar.bz2 upstream-3500fd7938a6d0c0e320295f0aa2fa34b1ebc08d.zip | |
kernel: 5.4: fix patches after wireguard backport
No major problems, just a minor Kconfig fix and a refresh.
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
3 files changed, 7 insertions, 25 deletions
diff --git a/target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch b/target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch index af96599ce8..c1b0b8551e 100644 --- a/target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch +++ b/target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch @@ -35,24 +35,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config CRYPTO_USER tristate "Userspace cryptographic algorithm configuration" -@@ -136,8 +136,6 @@ config CRYPTO_USER - Userspace configuration for cryptographic instantiations such as - cbc(aes). - --if CRYPTO_MANAGER2 -- - config CRYPTO_MANAGER_DISABLE_TESTS - bool "Disable run-time self tests" - default y -@@ -145,6 +143,8 @@ config CRYPTO_MANAGER_DISABLE_TESTS - Disable run-time self tests that normally take place at - algorithm registration. - -+if CRYPTO_MANAGER2 -+ - config CRYPTO_MANAGER_EXTRA_TESTS - bool "Enable extra run-time crypto self tests" - depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -240,8 +240,12 @@ static int cryptomgr_schedule_test(struc diff --git a/target/linux/generic/hack-5.4/260-lib-arc4-unhide.patch b/target/linux/generic/hack-5.4/260-lib-arc4-unhide.patch index b518ee2c37..a7668acfad 100644 --- a/target/linux/generic/hack-5.4/260-lib-arc4-unhide.patch +++ b/target/linux/generic/hack-5.4/260-lib-arc4-unhide.patch @@ -2,14 +2,14 @@ This makes it possible to select CONFIG_CRYPTO_LIB_ARC4 directly. We need this to be able to compile this into the kernel and make use of it from backports. ---- a/crypto/Kconfig -+++ b/crypto/Kconfig -@@ -1151,7 +1151,7 @@ config CRYPTO_ANUBIS - <http://www.larc.usp.br/~pbarreto/AnubisPage.html> +--- a/lib/crypto/Kconfig ++++ b/lib/crypto/Kconfig +@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES + tristate config CRYPTO_LIB_ARC4 - tristate + tristate "ARC4 cipher library" - config CRYPTO_ARC4 - tristate "ARC4 cipher algorithm" + config CRYPTO_ARCH_HAVE_LIB_BLAKE2S + tristate diff --git a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch index f497688556..052db7ef5c 100644 --- a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch @@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com> ifdef CONFIG_FUNCTION_TRACER ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)) -@@ -150,6 +160,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/ +@@ -149,6 +159,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/ obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/ obj-$(CONFIG_XZ_DEC) += xz/ obj-$(CONFIG_RAID6_PQ) += raid6/ |