mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.10 to 5.10.119
Delete the crypto-lib-blake2s kmod package, as BLAKE2s is now built-in. Patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
aba1f6e072
commit
56dd091b41
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .118
|
LINUX_VERSION-5.10 = .119
|
||||||
LINUX_KERNEL_HASH-5.10.118 = c5e020f187a195ab0924fe7e71b8ab8fb92936ab47bc9d15e78daabddefe0b4b
|
LINUX_KERNEL_HASH-5.10.119 = 3e353e55a2b7074c905c7c517c6dae83eae440f98a12ffd471dc4df1d5172511
|
||||||
|
@ -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 \
|
||||||
|
@ -656,8 +656,8 @@
|
|||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
+#include <linux/in6.h>
|
+#include <linux/in6.h>
|
||||||
|
|
||||||
u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
|
u64 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
|
||||||
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
|
u64 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
|
||||||
--- a/include/uapi/linux/in.h
|
--- a/include/uapi/linux/in.h
|
||||||
+++ b/include/uapi/linux/in.h
|
+++ b/include/uapi/linux/in.h
|
||||||
@@ -88,7 +88,7 @@ enum {
|
@@ -88,7 +88,7 @@ enum {
|
||||||
|
@ -1131,7 +1131,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
|
||||||
@@ -983,8 +983,10 @@ char *symbol_string(char *buf, char *end
|
@@ -985,8 +985,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')
|
||||||
@@ -1001,8 +1003,14 @@ char *symbol_string(char *buf, char *end
|
@@ -1003,8 +1005,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