From 0dccf8045ed397fe3eb227a879ee999c3657e938 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 12 Feb 2011 23:55:06 +0000
Subject: [PATCH] move the cbc 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@25493 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/crypto.mk     | 11 ++++++++++-
 package/kernel/modules/netsupport.mk |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index aaa9d534b2..d17e9c6c2c 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -28,7 +28,6 @@ CRYPTO_MODULES = \
 	BLKCIPHER2=crypto_blkcipher \
 	HASH2=crypto_hash \
 	MANAGER2=cryptomgr \
-	CBC=cbc \
 	ECB=ecb
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
@@ -172,6 +171,16 @@ endef
 
 $(eval $(call KernelPackage,crypto-authenc))
 
+define KernelPackage/crypto-cbc
+  TITLE:=Cipher Block Chaining CryptoAPI module
+  KCONFIG:=CONFIG_CRYPTO_CBC
+  FILES:=$(LINUX_DIR)/crypto/cbc.ko
+  AUTOLOAD:=$(call AutoLoad,09,cbc)
+  $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-cbc))
+
 define KernelPackage/crypto-des
   TITLE:=DES/3DES cipher CryptoAPI module
   KCONFIG:=CONFIG_CRYPTO_DES
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 0d8fcca06f..e0e423893f 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 +kmod-crypto-deflate
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate +kmod-crypto-cbc
   KCONFIG:= \
 	CONFIG_NET_KEY \
 	CONFIG_XFRM_USER \