fix IMQ autoloading

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

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index bd819b0..9351056 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,6 +8,30 @@
 
 CRYPTO_MENU:=Cryptographic API modules
 
 
 CRYPTO_MENU:=Cryptographic API modules
 

+# XXX: added workarounds for modules renamed in 2.6 series:
+#  - aes > aes_generic (2.6.24)
+#  - blkcipher -> crypto_blkcipher (2.6.25)
+#  - des > des_generic (2.6.24)
+#  - sha1 > sha1_generic (2.6.24)
+#  - sha256 > sha256_generic (2.6.24)
+#  - sha512 > sha512_generic (2.6.26)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
+  CRYPTO_GENERIC:=_generic
+  AES_SUFFIX:=$(CRYPTO_GENERIC)
+  DES_SUFFIX:=$(CRYPTO_GENERIC)
+  SHA1_SUFFIX:=$(CRYPTO_GENERIC)
+  SHA256_SUFFIX:=$(CRYPTO_GENERIC)
+endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
+  CRYPTO_PREFIX:=crypto_
+  BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX)
+endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
+  SHA512_SUFFIX:=$(CRYPTO_GENERIC)
+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
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Core CryptoAPI modules
 define KernelPackage/crypto-core
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Core CryptoAPI modules


@@ -19,10 +43,11 @@ define KernelPackage/crypto-core
        CONFIG_CRYPTO_DEFLATE \
        CONFIG_CRYPTO_ECB \
        CONFIG_CRYPTO_HASH \
        CONFIG_CRYPTO_DEFLATE \
        CONFIG_CRYPTO_ECB \
        CONFIG_CRYPTO_HASH \

+       CONFIG_CRYPTO_HMAC \

        CONFIG_CRYPTO_MANAGER
   FILES:= \
        $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
        CONFIG_CRYPTO_MANAGER
   FILES:= \
        $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \

-       $(LINUX_DIR)/crypto/blkcipher.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/$(BLKCIPHER_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) \
        $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \


@@ -32,7 +57,7 @@ define KernelPackage/crypto-core
        crypto_algapi \
        cryptomgr \
        crypto_hash \
        crypto_algapi \
        cryptomgr \
        crypto_hash \

-       blkcipher \
+       $(BLKCIPHER_PREFIX)blkcipher \

        cbc \
        ecb \
        deflate \
        cbc \
        ecb \
        deflate \


@@ -50,18 +75,16 @@ $(eval $(call KernelPackage,crypto-core))
 define KernelPackage/crypto-aes
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=AES cipher CryptoAPI module
 define KernelPackage/crypto-aes
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=AES cipher CryptoAPI module

-  DEPENDS:=kmod-crypto-core
-  KCONFIG:= \
-       CONFIG_CRYPTO_AES \
-       CONFIG_CRYPTO_AES_586
-  FILES:=$(LINUX_DIR)/crypto/aes.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,aes)
+  DEPENDS:=+kmod-crypto-core
+  KCONFIG:=CONFIG_CRYPTO_AES
+  FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX))

 endef
 
 define KernelPackage/crypto-aes/x86-2.6
 endef
 
 define KernelPackage/crypto-aes/x86-2.6

-  KCONFIG:=CONFIG_CRYPTO_AES_586
-  FILES:=$(LINUX_DIR)/arch/i386/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,aes-i586)
+  KCONFIG+=CONFIG_CRYPTO_AES_586
+  FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586)

 endef
 
 $(eval $(call KernelPackage,crypto-aes))
 endef
 
 $(eval $(call KernelPackage,crypto-aes))


@@ -70,7 +93,7 @@ $(eval $(call KernelPackage,crypto-aes))
 define KernelPackage/crypto-arc4
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=ARC4 (RC4) cipher CryptoAPI module
 define KernelPackage/crypto-arc4
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=ARC4 (RC4) cipher CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_ARC4
   FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,arc4)
   KCONFIG:=CONFIG_CRYPTO_ARC4
   FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,arc4)


@@ -79,13 +102,35 @@ endef
 $(eval $(call KernelPackage,crypto-arc4))
 
 
 $(eval $(call KernelPackage,crypto-arc4))
 
 

+define KernelPackage/crypto-aead
+  SUBMENU:=$(CRYPTO_MENU)
+  TITLE:=Authenticated Encryption with Associated Data
+  DEPENDS:=+kmod-crypto-core
+  KCONFIG:=CONFIG_CRYPTO_AEAD
+  FILES:=$(LINUX_DIR)/crypto/aead.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,aead)
+endef
+
+$(eval $(call KernelPackage,crypto-aead))
+
+define KernelPackage/crypto-authenc
+  SUBMENU:=$(CRYPTO_MENU)
+  TITLE:=Combined mode wrapper for IPsec
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-aead
+  KCONFIG:=CONFIG_CRYPTO_AUTHENC
+  FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,authenc)
+endef
+
+$(eval $(call KernelPackage,crypto-authenc))
+

 define KernelPackage/crypto-des
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=DES/3DES cipher CryptoAPI module
 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)
+  DEPENDS:=+kmod-crypto-core
+  KCONFIG:=CONFIG_CRYPTO_DES
+  FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX))

 endef
 
 $(eval $(call KernelPackage,crypto-des))
 endef
 
 $(eval $(call KernelPackage,crypto-des))


@@ -94,7 +139,7 @@ $(eval $(call KernelPackage,crypto-des))
 define KernelPackage/crypto-hmac
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=HMAC digest CryptoAPI module
 define KernelPackage/crypto-hmac
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=HMAC digest CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_HMAC
   FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,hmac)
   KCONFIG:=CONFIG_CRYPTO_HMAC
   FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,hmac)


@@ -106,7 +151,7 @@ $(eval $(call KernelPackage,crypto-hmac))
 define KernelPackage/crypto-md5
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=MD5 digest CryptoAPI module
 define KernelPackage/crypto-md5
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=MD5 digest CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_MD5
   FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,md5)
   KCONFIG:=CONFIG_CRYPTO_MD5
   FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,md5)


@@ -118,7 +163,7 @@ $(eval $(call KernelPackage,crypto-md5))
 define KernelPackage/crypto-michael-mic
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Michael MIC keyed digest CryptoAPI module
 define KernelPackage/crypto-michael-mic
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Michael MIC keyed digest CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC
   FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,michael_mic)
   KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC
   FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,michael_mic)


@@ -130,10 +175,10 @@ $(eval $(call KernelPackage,crypto-michael-mic))
 define KernelPackage/crypto-sha1
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=SHA1 digest CryptoAPI module
 define KernelPackage/crypto-sha1
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=SHA1 digest CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_SHA1
   KCONFIG:=CONFIG_CRYPTO_SHA1

-  FILES:=$(LINUX_DIR)/crypto/sha1.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,09,sha1)
+  FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX))

 endef
 
 $(eval $(call KernelPackage,crypto-sha1))
 endef
 
 $(eval $(call KernelPackage,crypto-sha1))


@@ -142,7 +187,7 @@ $(eval $(call KernelPackage,crypto-sha1))
 define KernelPackage/crypto-misc
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Other CryptoAPI modules
 define KernelPackage/crypto-misc
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Other CryptoAPI modules

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:= \
        CONFIG_CRYPTO_ANUBIS \
        CONFIG_CRYPTO_BLOWFISH \
   KCONFIG:= \
        CONFIG_CRYPTO_ANUBIS \
        CONFIG_CRYPTO_BLOWFISH \


@@ -169,8 +214,8 @@ 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/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/sha512.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).$(LINUX_KMOD_SUFFIX) \
+       $(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/wp512.$(LINUX_KMOD_SUFFIX)
        $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX)


@@ -186,11 +231,34 @@ endef
 
 $(eval $(call KernelPackage,crypto-misc))
 
 
 $(eval $(call KernelPackage,crypto-misc))
 

+define KernelPackage/crypto-ocf
+  SUBMENU:=$(CRYPTO_MENU)
+  TITLE:=OCF modules
+  DEPENDS:=+kmod-crypto-core @!TARGET_uml
+  KCONFIG:= \
+       CONFIG_OCF_OCF \
+       CONFIG_OCF_CRYPTODEV \
+       CONFIG_OCF_CRYPTOSOFT \
+       CONFIG_OCF_FIPS=y \
+       CONFIG_OCF_RANDOMHARVEST=y
+  FILES:= \
+       $(LINUX_DIR)/crypto/ocf/ocf.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/ocf/cryptodev.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/ocf/cryptosoft.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,09, \
+       ocf \
+       cryptodev \
+       cryptosoft \
+  )
+endef
+
+$(eval $(call KernelPackage,crypto-ocf))
+

 
 define KernelPackage/crypto-null
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Null CryptoAPI module
 
 define KernelPackage/crypto-null
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Null CryptoAPI module

-  DEPENDS:=kmod-crypto-core
+  DEPENDS:=+kmod-crypto-core

   KCONFIG:=CONFIG_CRYPTO_NULL
   FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,crypto_null)
   KCONFIG:=CONFIG_CRYPTO_NULL
   FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,crypto_null)


@@ -202,8 +270,8 @@ $(eval $(call KernelPackage,crypto-null))
 define KernelPackage/crypto-test
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Test CryptoAPI module
 define KernelPackage/crypto-test
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Test CryptoAPI module

-  DEPENDS:=kmod-crypto-core
-  KCONFIG:=CONFIG_CRYPTO_NULL
+  DEPENDS:=+kmod-crypto-core
+  KCONFIG:=CONFIG_CRYPTO_TEST

   FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,tcrypt)
 endef
   FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,tcrypt)
 endef