remove hacks to disable modules on some targets now that we do have proper PCI &...

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

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 3fad326..68ccb60 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -8,6 +8,21 @@
 
 CRYPTO_MENU:=Cryptographic API modules
 
+# XXX: added CRYPTO_GENERIC as a workaround for modules renamed in 2.6.24:
+#  - aes > aes_generic
+#  - des > des_generic
+#  - sha1 > sha1_generic
+#  - sha256 > sha256_generic
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
+  CRYPTO_GENERIC:=_generic
+endif
+
+# XXX: added CRYPTO_PREFIX as a workaround for modules renamed in 2.6.25:
+#  - blkcipher -> crypto_blkcipher
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
+  CRYPTO_PREFIX:=crypto_
+endif
+
 # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is 
 # always set, even if no hash modules are selected
 define KernelPackage/crypto-core
@@ -25,7 +40,7 @@ define KernelPackage/crypto-core
        CONFIG_CRYPTO_MANAGER
   FILES:= \
        $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/blkcipher.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/$(CRYPTO_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
@@ -35,7 +50,7 @@ define KernelPackage/crypto-core
        crypto_algapi \
        cryptomgr \
        crypto_hash \
-       blkcipher \
+       $(CRYPTO_PREFIX)blkcipher \
        cbc \
        ecb \
        deflate \
@@ -57,13 +72,13 @@ define KernelPackage/crypto-aes
   KCONFIG:= \
        CONFIG_CRYPTO_AES \
        CONFIG_CRYPTO_AES_586
-  FILES:=$(LINUX_DIR)/crypto/aes.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,aes)
+  FILES:=$(LINUX_DIR)/crypto/aes$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,aes$(CRYPTO_GENERIC))
 endef
 
 define KernelPackage/crypto-aes/x86-2.6
   KCONFIG:=CONFIG_CRYPTO_AES_586
-  FILES:=$(LINUX_DIR)/arch/i386/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,aes-i586)
 endef
 
@@ -86,9 +101,9 @@ define KernelPackage/crypto-des
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=DES/3DES cipher CryptoAPI module
   DEPENDS:=+kmod-crypto-core
-  KCONFIG:=CONFIG_CRYPTO_AES
-  FILES:=$(LINUX_DIR)/crypto/aes.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,des)
+  KCONFIG:=CONFIG_CRYPTO_DES
+  FILES:=$(LINUX_DIR)/crypto/des$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,des$(CRYPTO_GENERIC))
 endef
 
 $(eval $(call KernelPackage,crypto-des))
@@ -135,8 +150,8 @@ define KernelPackage/crypto-sha1
   TITLE:=SHA1 digest CryptoAPI module
   DEPENDS:=+kmod-crypto-core
   KCONFIG:=CONFIG_CRYPTO_SHA1
-  FILES:=$(LINUX_DIR)/crypto/sha1.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,sha1)
+  FILES:=$(LINUX_DIR)/crypto/sha1$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,sha1$(CRYPTO_GENERIC))
 endef
 
 $(eval $(call KernelPackage,crypto-sha1))
@@ -172,7 +187,7 @@ define KernelPackage/crypto-misc
        $(LINUX_DIR)/crypto/khazad.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/md4.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/serpent.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/crypto/sha256.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/sha256$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/sha512.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \
@@ -206,7 +221,7 @@ define KernelPackage/crypto-test
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Test CryptoAPI module
   DEPENDS:=+kmod-crypto-core
-  KCONFIG:=CONFIG_CRYPTO_NULL
+  KCONFIG:=CONFIG_CRYPTO_TEST
   FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,tcrypt)
 endef