diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-09-08 12:31:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-08 12:31:04 +0000 |
| commit | e29efa2fb75c2bbe70f5f4027973eab5660db9cc (patch) | |
| tree | 8528734f3345b9433a8410b95b799f3f7a3a3d2b /package/kernel/linux/modules | |
| parent | 1b91cd2663b95c47942448222e74e22176466457 (diff) | |
| download | upstream-e29efa2fb75c2bbe70f5f4027973eab5660db9cc.tar.gz upstream-e29efa2fb75c2bbe70f5f4027973eab5660db9cc.tar.bz2 upstream-e29efa2fb75c2bbe70f5f4027973eab5660db9cc.zip | |
kernel: remove packaging of kmod-crypto-core and kmod-crypto-arc4
Everything except for blkcipher was already built-in, so make blkcipher
built-in as well.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46820
Diffstat (limited to 'package/kernel/linux/modules')
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 28 | ||||
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 1 | ||||
| -rw-r--r-- | package/kernel/linux/modules/netsupport.mk | 4 |
3 files changed, 3 insertions, 30 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 2e245e37a9..c790b58b50 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -15,24 +15,9 @@ crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) -define KernelPackage/crypto-core - SUBMENU:=$(CRYPTO_MENU) - TITLE:=Core CryptoAPI modules - KCONFIG:= \ - CONFIG_CRYPTO=y \ - CONFIG_CRYPTO_HW=y \ - CONFIG_CRYPTO_BLKCIPHER \ - CONFIG_CRYPTO_ALGAPI \ - $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) - FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))) -endef - -$(eval $(call KernelPackage,crypto-core)) - - define AddDepends/crypto SUBMENU:=$(CRYPTO_MENU) - DEPENDS+=+kmod-crypto-core $(1) + DEPENDS+= $(1) endef define KernelPackage/crypto-aead @@ -255,17 +240,6 @@ endef $(eval $(call KernelPackage,crypto-hw-omap)) -define KernelPackage/crypto-arc4 - TITLE:=ARC4 (RC4) cipher CryptoAPI module - KCONFIG:=CONFIG_CRYPTO_ARC4 - FILES:=$(LINUX_DIR)/crypto/arc4.ko - AUTOLOAD:=$(call AutoLoad,09,arc4) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-arc4)) - - define KernelPackage/crypto-authenc TITLE:=Combined mode wrapper for IPsec DEPENDS:=+kmod-crypto-manager diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index e702a3d9b3..5900a4b140 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -90,7 +90,6 @@ define KernelPackage/fs-cifs AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ - +kmod-crypto-arc4 \ +kmod-crypto-hmac \ +kmod-crypto-md5 \ +kmod-crypto-md4 \ diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index adfdace360..333237f44b 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -713,7 +713,7 @@ $(eval $(call KernelPackage,ipoa)) define KernelPackage/mppe SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Microsoft PPP compression/encryption - DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 +kmod-crypto-ecb + DEPENDS:=kmod-ppp +kmod-crypto-sha1 +kmod-crypto-ecb KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE @@ -997,7 +997,7 @@ define KernelPackage/rxrpc $(LINUX_DIR)/net/rxrpc/af-rxrpc.ko \ $(LINUX_DIR)/net/rxrpc/rxkad.ko AUTOLOAD:=$(call AutoLoad,30,rxkad af-rxrpc) - DEPENDS:=+kmod-crypto-core +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt + DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt endef define KernelPackage/rxrpc/description |