domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: move BLKCIPHER into crypto-core to avoid pulling in crypto-manager for arc4 (used by mac80211)

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39052
This commit is contained in:
Felix Fietkau
2013-12-14 16:40:24 +00:00
parent 96d5726e92
commit 5991eb39b9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
package/kernel/linux/modules/crypto.mk
View File

@@ -7,12 +7,13 @@
CRYPTO_MENU:=Cryptographic API modules CRYPTO_MENU:=Cryptographic API modules
CRYPTO_MODULES = ALGAPI2=crypto_algapi CRYPTO_MODULES = \
ALGAPI2=crypto_algapi \
BLKCIPHER2=crypto_blkcipher
CRYPTOMGR_MODULES = \ CRYPTOMGR_MODULES = \
AEAD2=aead \ AEAD2=aead \
MANAGER2=cryptomgr \ MANAGER2=cryptomgr \
BLKCIPHER2=crypto_blkcipher
crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
@@ -24,6 +25,7 @@ define KernelPackage/crypto-core
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO=y \ CONFIG_CRYPTO=y \
CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_ALGAPI \ CONFIG_CRYPTO_ALGAPI \
$(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))) FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
@@ -53,7 +55,6 @@ define KernelPackage/crypto-manager
DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress DEPENDS:=+kmod-crypto-hash +kmod-crypto-pcompress
KCONFIG:= \ KCONFIG:= \
CONFIG_CRYPTO_AEAD \ CONFIG_CRYPTO_AEAD \
CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_MANAGER \ CONFIG_CRYPTO_MANAGER \
$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod))) $(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod)))
FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod))) FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod)))
@@ -248,7 +249,7 @@ define KernelPackage/crypto-arc4
KCONFIG:=CONFIG_CRYPTO_ARC4 KCONFIG:=CONFIG_CRYPTO_ARC4
FILES:=$(LINUX_DIR)/crypto/arc4.ko FILES:=$(LINUX_DIR)/crypto/arc4.ko
AUTOLOAD:=$(call AutoLoad,09,arc4) AUTOLOAD:=$(call AutoLoad,09,arc4)
$(call AddDepends/crypto,+!LINUX_3_3:kmod-crypto-manager) $(call AddDepends/crypto)
endef endef
$(eval $(call KernelPackage,crypto-arc4)) $(eval $(call KernelPackage,crypto-arc4))