[package] fix kmod-nls-base dependency with usb-core (#6753)

[openwrt.git] / package / kernel / modules / crypto.mk

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 818a1d0..d3c24c9 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -97,6 +97,7 @@ $(call KernelPackage/crypto/Depends,+kmod-crypto-des @!TARGET_ubicom32)
   TITLE:=HIFN 795x crypto accelerator
   KCONFIG:= \
        CONFIG_CRYPTO_HW=y \
+       CONFIG_HW_RANDOM=y \
        CONFIG_CRYPTO_DEV_HIFN_795X \
        CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
   FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX)
@@ -148,7 +149,7 @@ $(call KernelPackage/crypto/Depends,)
   AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX))
 endef
 
-define KernelPackage/crypto-aes/x86-2.6
+define KernelPackage/crypto-aes/x86
   FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586)
 endef
@@ -251,6 +252,7 @@ $(call KernelPackage/crypto/Depends,)
        CONFIG_CRYPTO_TEA \
        CONFIG_CRYPTO_TGR192 \
        CONFIG_CRYPTO_TWOFISH \
+       CONFIG_CRYPTO_TWOFISH_COMMON \
        CONFIG_CRYPTO_TWOFISH_586 \
        CONFIG_CRYPTO_WP512
   FILES:= \
@@ -273,14 +275,19 @@ define KernelPackage/crypto-misc/2.6
        $(LINUX_DIR)/crypto/camellia.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/fcrypt.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/crypto-misc/x86
+  FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.$(LINUX_KMOD_SUFFIX)
 endef
 
 $(eval $(call KernelPackage,crypto-misc))
 
 
 define KernelPackage/crypto-ocf
-$(call KernelPackage/crypto/Depends,@!TARGET_uml)
+$(call KernelPackage/crypto/Depends,@!TARGET_uml +@OPENSSL_ENGINE)
   TITLE:=OCF modules
   KCONFIG:= \
        CONFIG_OCF_OCF \