kernel: include aes-i586 and twofish-i586 into crypto packages for x86

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20343 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index a068964c3fb62221d4a0789a903179f18939cd09..0e161fea091030dc5a5fd6fa2e1c11392b2fc313 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -149,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
@@ -252,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:= \
@@ -266,6 +267,7 @@ $(call KernelPackage/crypto/Depends,)
        $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -277,6 +279,10 @@ define KernelPackage/crypto-misc/2.6
        $(LINUX_DIR)/crypto/tgr192.$(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))