aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-12-10 18:43:42 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-12-10 18:43:42 +0000
commitfe2af46117635c9a17c809b0bab9671fad5ea95c (patch)
treed05dfc34a2ce2de0841535ccefaebb257709ae10 /package
parent4dc65aed6399f5122f9daa854c1981fb8b8a48e5 (diff)
downloadupstream-fe2af46117635c9a17c809b0bab9671fad5ea95c.tar.gz
upstream-fe2af46117635c9a17c809b0bab9671fad5ea95c.tar.bz2
upstream-fe2af46117635c9a17c809b0bab9671fad5ea95c.zip
move aead into crypto-core
SVN-Revision: 13584
Diffstat (limited to 'package')
-rw-r--r--package/kernel/modules/crypto.mk18
1 files changed, 4 insertions, 14 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index af268088d0..860eeed145 100644
--- 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) \
@@ -123,8 +125,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)
@@ -167,21 +168,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)