load crypto_blkcipher before cryptomgr.. *sigh*

[openwrt/svn-archive/archive.git] / package / kernel / modules / crypto.mk

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 0b77c1da62f487f5bf900ad022c666789acdf2b0..26d0717b650ac29bd57f5810bb124bb6c52eb58b 100644 (file)
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -37,6 +37,7 @@ define KernelPackage/crypto-core
   TITLE:=Core CryptoAPI modules
   KCONFIG:= \
        CONFIG_CRYPTO=y \
+       CONFIG_CRYPTO_AEAD \
        CONFIG_CRYPTO_ALGAPI \
        CONFIG_CRYPTO_BLKCIPHER \
        CONFIG_CRYPTO_CBC \
@@ -47,6 +48,7 @@ define KernelPackage/crypto-core
        CONFIG_CRYPTO_MANAGER
   FILES:= \
        $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/crypto/aead.$(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) \
@@ -55,9 +57,10 @@ define KernelPackage/crypto-core
        $(LINUX_DIR)/crypto/cryptomgr.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,01, \
        crypto_algapi \
+       aead \
+       $(BLKCIPHER_PREFIX)blkcipher \
        cryptomgr \
        crypto_hash \
-       $(BLKCIPHER_PREFIX)blkcipher \
        cbc \
        ecb \
        deflate \
@@ -77,6 +80,7 @@ define KernelPackage/crypto-hw-padlock
   TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
   DEPENDS:=+kmod-crypto-core
   KCONFIG:= \
+       CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_PADLOCK \
        CONFIG_CRYPTO_DEV_PADLOCK_AES \
        CONFIG_CRYPTO_DEV_PADLOCK_SHA
@@ -94,6 +98,7 @@ define KernelPackage/crypto-hw-geode
   TITLE:=AMD Geode hardware crypto module
   DEPENDS:=+kmod-crypto-core
   KCONFIG:= \
+       CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_GEODE
   FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,geode-aes)
@@ -107,6 +112,7 @@ define KernelPackage/crypto-hw-hifn-795x
   TITLE:=HIFN 795x crypto accelerator
   DEPENDS:=+kmod-crypto-core +kmod-crypto-des
   KCONFIG:= \
+       CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_HIFN_795X \
        CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
   FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX)
@@ -120,8 +126,7 @@ define KernelPackage/crypto-hw-ixp4xx
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Intel IXP4xx hardware crypto module
   DEPENDS:= \
-       @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-aead \
-       +kmod-crypto-authenc
+       @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc
   KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX
   FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto)
@@ -164,21 +169,10 @@ endef
 $(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
+  DEPENDS:=+kmod-crypto-core
   KCONFIG:=CONFIG_CRYPTO_AUTHENC
   FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,09,authenc)