From 887e847ee94c752a34ee3c9e498e45074ab805c8 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 12 Feb 2011 23:54:59 +0000 Subject: [PATCH] move the deflate crypto module out of the crypto core and into a separate package - it is only used for ipsec git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25491 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 13 +++++++++++-- package/kernel/modules/netsupport.mk | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 5cf3b0d3b..4600c67b3 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 1baba4b5b..0d8fcca06 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 \ -- 2.20.1