diff options
Diffstat (limited to 'package/kernel')
-rw-r--r-- | package/kernel/linux/modules/crypto.mk | 57 | ||||
-rw-r--r-- | package/kernel/linux/modules/netsupport.mk | 2 |
2 files changed, 5 insertions, 54 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index cc62f2cc27..71c58d4afc 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -123,12 +123,11 @@ $(eval $(call KernelPackage,crypto-rng)) define KernelPackage/crypto-iv TITLE:=CryptoAPI initialization vectors DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq - KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 CONFIG_CRYPTO_ECHAINIV + KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 FILES:= \ - $(LINUX_DIR)/crypto/eseqiv.ko \ - $(LINUX_DIR)/crypto/chainiv.ko \ - $(LINUX_DIR)/crypto/echainiv.ko@ge4.3 - AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv echainiv@ge4.3) + $(LINUX_DIR)/crypto/eseqiv.ko@lt4.8 \ + $(LINUX_DIR)/crypto/chainiv.ko@lt4.8 + AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv) $(call AddDepends/crypto) endef @@ -631,54 +630,6 @@ endif $(eval $(call KernelPackage,crypto-misc)) -define KernelPackage/crypto-ocf - TITLE:=OCF modules - DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @!TARGET_uml +kmod-crypto-manager - KCONFIG:= \ - CONFIG_OCF_OCF \ - CONFIG_OCF_CRYPTODEV \ - CONFIG_OCF_CRYPTOSOFT \ - CONFIG_OCF_FIPS=y \ - CONFIG_OCF_RANDOMHARVEST=y - FILES:= \ - $(LINUX_DIR)/crypto/ocf/ocf.ko \ - $(LINUX_DIR)/crypto/ocf/cryptodev.ko \ - $(LINUX_DIR)/crypto/ocf/cryptosoft.ko - AUTOLOAD:=$(call AutoLoad,09, \ - ocf \ - cryptodev \ - cryptosoft \ - ) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-ocf)) - - -define KernelPackage/crypto-ocf-hifn7751 - TITLE:=OCF support for Hifn 6500/7751/7811/795x, Invertex AEON and NetSec 7751 devices - DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf - KCONFIG:=CONFIG_OCF_HIFN - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko - AUTOLOAD:=$(call AutoLoad,10,hifn7751) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-ocf-hifn7751)) - - -define KernelPackage/crypto-ocf-hifnhipp - TITLE:=OCF support for Hifn 7855/8155 devices - DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf - KCONFIG:=CONFIG_OCF_HIFNHIPP - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko - AUTOLOAD:=$(call AutoLoad,10,hifnHIPP) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-ocf-hifnhipp)) - - define KernelPackage/crypto-null TITLE:=Null CryptoAPI module KCONFIG:=CONFIG_CRYPTO_NULL diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 032e085c2f..3ad0ada933 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -286,7 +286,7 @@ IPSEC-m:= \ define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4 and IPv6) - DEPENDS:=+kmod-crypto-authenc +kmod-crypto-iv +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate +kmod-crypto-cbc + DEPENDS:=+kmod-crypto-authenc +kmod-crypto-iv +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate +kmod-crypto-cbc +kmod-crypto-echainiv KCONFIG:= \ CONFIG_NET_KEY \ CONFIG_XFRM_USER \ |