mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.44 (#9457)
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
parent
98f703f4b1
commit
91b3516ba1
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .43
|
LINUX_VERSION-5.15 = .44
|
||||||
LINUX_KERNEL_HASH-5.15.43 = 064b913a9d58773a85cafa62f2a2f9031aeee724d7e41b66631037d9a6571c12
|
LINUX_KERNEL_HASH-5.15.44 = 9bfabc38e56758bd0cfe22715a3f9a74cdf4a8870f3b150a03d2ffda29f832dc
|
||||||
|
@ -446,33 +446,6 @@ endef
|
|||||||
|
|
||||||
$(eval $(call KernelPackage,crypto-kpp))
|
$(eval $(call KernelPackage,crypto-kpp))
|
||||||
|
|
||||||
define KernelPackage/crypto-lib-blake2s
|
|
||||||
TITLE:=BLAKE2s hash function library
|
|
||||||
KCONFIG:=CONFIG_CRYPTO_LIB_BLAKE2S
|
|
||||||
HIDDEN:=1
|
|
||||||
FILES:= \
|
|
||||||
$(LINUX_DIR)/lib/crypto/libblake2s.ko \
|
|
||||||
$(LINUX_DIR)/lib/crypto/libblake2s-generic.ko
|
|
||||||
$(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/crypto-lib-blake2s/config
|
|
||||||
imply PACKAGE_kmod-crypto-hash
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/crypto-lib-blake2s/x86/64
|
|
||||||
KCONFIG+=CONFIG_CRYPTO_BLAKE2S_X86
|
|
||||||
FILES+=$(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
define KernelPackage/crypto-lib-blake2s/arm
|
|
||||||
KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM
|
|
||||||
FILES+=$(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call KernelPackage,crypto-lib-blake2s))
|
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/crypto-lib-chacha20
|
define KernelPackage/crypto-lib-chacha20
|
||||||
TITLE:=ChaCha library interface
|
TITLE:=ChaCha library interface
|
||||||
KCONFIG:=CONFIG_CRYPTO_LIB_CHACHA
|
KCONFIG:=CONFIG_CRYPTO_LIB_CHACHA
|
||||||
|
@ -1290,7 +1290,6 @@ define KernelPackage/wireguard
|
|||||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||||
TITLE:=WireGuard secure network tunnel
|
TITLE:=WireGuard secure network tunnel
|
||||||
DEPENDS:= \
|
DEPENDS:= \
|
||||||
+kmod-crypto-lib-blake2s \
|
|
||||||
+kmod-crypto-lib-chacha20poly1305 \
|
+kmod-crypto-lib-chacha20poly1305 \
|
||||||
+kmod-crypto-lib-curve25519 \
|
+kmod-crypto-lib-curve25519 \
|
||||||
+kmod-udptunnel4 \
|
+kmod-udptunnel4 \
|
||||||
|
@ -1171,7 +1171,6 @@ CONFIG_CRYPTO_KPP=y
|
|||||||
CONFIG_CRYPTO_KPP2=y
|
CONFIG_CRYPTO_KPP2=y
|
||||||
CONFIG_CRYPTO_LIB_AES=y
|
CONFIG_CRYPTO_LIB_AES=y
|
||||||
CONFIG_CRYPTO_LIB_ARC4=y
|
CONFIG_CRYPTO_LIB_ARC4=y
|
||||||
# CONFIG_CRYPTO_LIB_BLAKE2S is not set
|
|
||||||
# CONFIG_CRYPTO_LIB_CHACHA is not set
|
# CONFIG_CRYPTO_LIB_CHACHA is not set
|
||||||
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
|
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
|
||||||
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
|
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
|
||||||
|
@ -4,7 +4,7 @@ from backports.
|
|||||||
|
|
||||||
--- a/lib/crypto/Kconfig
|
--- a/lib/crypto/Kconfig
|
||||||
+++ b/lib/crypto/Kconfig
|
+++ b/lib/crypto/Kconfig
|
||||||
@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES
|
@@ -4,7 +4,7 @@ config CRYPTO_LIB_AES
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
config CRYPTO_LIB_ARC4
|
config CRYPTO_LIB_ARC4
|
||||||
@ -12,4 +12,4 @@ from backports.
|
|||||||
+ tristate "ARC4 cipher library"
|
+ tristate "ARC4 cipher library"
|
||||||
|
|
||||||
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
|
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
|
||||||
tristate
|
bool
|
||||||
|
@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/lib/vsprintf.c
|
--- a/lib/vsprintf.c
|
||||||
+++ b/lib/vsprintf.c
|
+++ b/lib/vsprintf.c
|
||||||
@@ -1001,8 +1001,10 @@ char *symbol_string(char *buf, char *end
|
@@ -1003,8 +1003,10 @@ char *symbol_string(char *buf, char *end
|
||||||
struct printf_spec spec, const char *fmt)
|
struct printf_spec spec, const char *fmt)
|
||||||
{
|
{
|
||||||
unsigned long value;
|
unsigned long value;
|
||||||
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (fmt[1] == 'R')
|
if (fmt[1] == 'R')
|
||||||
@@ -1023,8 +1025,14 @@ char *symbol_string(char *buf, char *end
|
@@ -1025,8 +1027,14 @@ char *symbol_string(char *buf, char *end
|
||||||
|
|
||||||
return string_nocheck(buf, end, sym, spec);
|
return string_nocheck(buf, end, sym, spec);
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user