From 8f979860f035adc7be3abfd1c58348c4c40cea1a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 30 May 2022 08:45:46 -0400 Subject: [PATCH] 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 --- package/kernel/linux/modules/crypto.mk | 26 ---------------------- package/kernel/linux/modules/netsupport.mk | 1 - target/linux/generic/config-5.4 | 1 - 3 files changed, 28 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 26a568fd3..622759b08 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -446,32 +446,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@lt5.9 \ - $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko@lt5.9 - $(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@lt5.9 -endef - -define KernelPackage/crypto-lib-blake2s/arm - KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM - FILES+=$(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko@lt5.9 -endef - -$(eval $(call KernelPackage,crypto-lib-blake2s)) - define KernelPackage/crypto-lib-chacha20 TITLE:=ChaCha library interface diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index c02be04ed..97873a0bc 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1290,7 +1290,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 807c6d72b..d3cdb24a8 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -1066,7 +1066,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