aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-12 23:54:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-12 23:54:59 +0000
commit2d9427566a8fb03a8b87aac55d9ed08f5d886344 (patch)
treed6383fd2e12eafc698e166dd0b278f755fb4df43
parentd64c314336a96ff8d7b29ba6ebb0c6ef0a4b9311 (diff)
downloadupstream-2d9427566a8fb03a8b87aac55d9ed08f5d886344.tar.gz
upstream-2d9427566a8fb03a8b87aac55d9ed08f5d886344.tar.bz2
upstream-2d9427566a8fb03a8b87aac55d9ed08f5d886344.zip
move the deflate crypto module out of the crypto core and into a separate package - it is only used for ipsec
SVN-Revision: 25491
-rw-r--r--package/kernel/modules/crypto.mk13
-rw-r--r--package/kernel/modules/netsupport.mk2
2 files changed, 12 insertions, 3 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 5cf3b0d3b6..4600c67b33 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -29,8 +29,7 @@ CRYPTO_MODULES = \
HASH2=crypto_hash \
MANAGER2=cryptomgr \
CBC=cbc \
- ECB=ecb \
- DEFLATE=deflate
+ ECB=ecb
crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko)
@@ -183,6 +182,16 @@ endef
$(eval $(call KernelPackage,crypto-des))
+define KernelPackage/crypto-deflate
+ TITLE:=Deflate compression CryptoAPI module
+ KCONFIG:=CONFIG_CRYPTO_DEFLATE
+ FILES:=$(LINUX_DIR)/crypto/deflate.ko
+ AUTOLOAD:=$(call AutoLoad,09,deflate)
+ $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-deflate))
+
define KernelPackage/crypto-hmac
TITLE:=HMAC digest CryptoAPI module
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 1baba4b5b7..0d8fcca06f 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -177,7 +177,7 @@ IPSEC-m:= \
define KernelPackage/ipsec
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPsec related modules (IPv4 and IPv6)
- DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
+ DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate
KCONFIG:= \
CONFIG_NET_KEY \
CONFIG_XFRM_USER \