diff options
| author | Robert Marko | 2026-01-09 19:37:01 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-01-11 10:12:04 +0000 |
| commit | 1bff8d0210eb619cb566211acdf136283d01af8c (patch) | |
| tree | e2eace55a6ed7d66b767fde3aa1d12c92233d204 | |
| parent | 46e4aa32836cf8d3ec4741c067470862af19b073 (diff) | |
| download | openwrt-1bff8d0210eb619cb566211acdf136283d01af8c.tar.gz | |
linux: crypto: fix dependencies for curve25519 and poly1305
Currently, kmod-crypto-kpp is only implied for curve25519 and thus it
can get unselected and then building will fail due to missing kpp.ko.
Same issue happens with kmod-crypto-hash for poly1305.
So, lets drop the whole implies logic and make sure to always select
them as dependencies.
Fixes: #21386
Link: https://github.com/openwrt/openwrt/pull/21483
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 93665d0aa35fe504a7195de24fa61f6db4243100)
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 3f6b20fbbb..869601eb70 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -624,11 +624,7 @@ define KernelPackage/crypto-lib-curve25519 FILES:= \ $(LINUX_DIR)/lib/crypto/libcurve25519.ko \ $(LINUX_DIR)/lib/crypto/libcurve25519-generic.ko - $(call AddDepends/crypto,+PACKAGE_kmod-crypto-kpp:kmod-crypto-kpp) -endef - -define KernelPackage/crypto-lib-curve25519/config - imply PACKAGE_kmod-crypto-kpp + $(call AddDepends/crypto,+kmod-crypto-kpp) endef ifndef CONFIG_TARGET_uml @@ -661,11 +657,7 @@ define KernelPackage/crypto-lib-poly1305 KCONFIG:=CONFIG_CRYPTO_LIB_POLY1305 HIDDEN:=1 FILES:=$(LINUX_DIR)/lib/crypto/libpoly1305.ko - $(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash) -endef - -define KernelPackage/crypto-lib-poly1305/config - imply PACKAGE_kmod-crypto-hash + $(call AddDepends/crypto,+kmod-crypto-hash) endef ifndef CONFIG_TARGET_uml |