ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-07 19:40:39 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

kernel: 5.4: fix patches after wireguard backport

Browse Source 
No major problems, just a minor Kconfig fix and a refresh.

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This commit is contained in:
Ilya Lipnitskiy 2021-02-19 08:04:26 -08:00 committed by David Bauer
parent 3888fa7880
commit 3500fd7938
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch
View File

@ -35,24 +35,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config CRYPTO_USER config CRYPTO_USER
tristate "Userspace cryptographic algorithm configuration" 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 --- a/crypto/algboss.c
+++ b/crypto/algboss.c +++ b/crypto/algboss.c
@@ -240,8 +240,12 @@ static int cryptomgr_schedule_test(struc @@ -240,8 +240,12 @@ static int cryptomgr_schedule_test(struc

12
target/linux/generic/hack-5.4/260-lib-arc4-unhide.patch
View File

@ -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 need this to be able to compile this into the kernel and make use of it
from backports. from backports.
--- a/crypto/Kconfig --- a/lib/crypto/Kconfig
+++ b/crypto/Kconfig +++ b/lib/crypto/Kconfig
@@ -1151,7 +1151,7 @@ config CRYPTO_ANUBIS @@ -6,7 +6,7 @@ config CRYPTO_LIB_AES
<http://www.larc.usp.br/~pbarreto/AnubisPage.html> tristate
config CRYPTO_LIB_ARC4 config CRYPTO_LIB_ARC4
- tristate - tristate
+ tristate "ARC4 cipher library" + tristate "ARC4 cipher library"
config CRYPTO_ARC4 config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
tristate "ARC4 cipher algorithm" tristate

2
target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch
View File

@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
ifdef CONFIG_FUNCTION_TRACER ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS) ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_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_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/ obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/ obj-$(CONFIG_RAID6_PQ) += raid6/