kernel: Remove kmod-crypto-lib-blake2s

Delete the crypto-lib-blake2s kmod package, as BLAKE2s is now built-in.

Fixes: be0639063a70 ("kernel: bump 5.4 to 5.4.203")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index b50ed06824bc7a57e70f98d3621729f034d5f3fc..4e0a73ccf2c934859007d7933a4324cae64a875e 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -440,28 +440,6 @@ endef
 $(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
-
-$(eval $(call KernelPackage,crypto-lib-blake2s))
-
-
 define KernelPackage/crypto-lib-chacha20
   TITLE:=ChaCha library interface
   KCONFIG:=CONFIG_CRYPTO_LIB_CHACHA

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 1eec9f9b639770750002a8510bd1df86c598cc52..4c84bea9bb229a15ce42f7290c2b4d9054e46ddd 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -1263,7 +1263,6 @@ define KernelPackage/wireguard
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=WireGuard secure network tunnel
   DEPENDS:= \
-         +kmod-crypto-lib-blake2s \
          +kmod-crypto-lib-chacha20poly1305 \
          +kmod-crypto-lib-curve25519 \
          +kmod-udptunnel4 \

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 3517ece49c4c805c99d1877d120d12982e048400..f205921c176327f7826e257b0c7fe3ce83ddf5a7 100644 (file)
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -1069,7 +1069,6 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_KHAZAD is not set
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=y
-# CONFIG_CRYPTO_LIB_BLAKE2S is not set
 # CONFIG_CRYPTO_LIB_CHACHA is not set
 # CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
 # CONFIG_CRYPTO_LIB_CURVE25519 is not set

diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index 434cde5d867a9f335962e06cbdf3b8abe31c32f1..519ae961e008c6783110bae864f2ff71ce856bff 100644 (file)
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -82,6 +82,7 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
+CONFIG_CRYPTO_BLAKE2S_X86=y
 # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
 # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set