diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-10 18:43:42 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-10 18:43:42 +0000 |
| commit | 296e1b80446aa2e0bd7a62cd82b26c879f72a752 (patch) | |
| tree | 34b3d2c740cb1e54862e2fc1e07e93cd3dc4fe35 /package/kernel | |
| parent | 43af26b16307d0be93e82dddc959ec8cb60ea395 (diff) | |
move aead into crypto-core
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13584 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/crypto.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index af268088d..860eeed14 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) |