X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=1e2214214816da40eaeb7ea933bad57574515c61;hp=c7bbce97829b4493e6ea3d4991599533aea002d1;hb=b31f23f517b72772f784987268da860bd3e3d21c;hpb=bb08efa4e56fb2f6ddf8d3a9aad269f512b3bf21 diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index c7bbce9782..1e22142148 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -29,7 +29,7 @@ define KernelPackage/crypto-core CONFIG_CRYPTO_ALGAPI \ $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))) - AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod)))) + AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod))),1) endef $(eval $(call KernelPackage,crypto-core)) @@ -43,7 +43,7 @@ define KernelPackage/crypto-hash TITLE:=CryptoAPI hash support KCONFIG:=CONFIG_CRYPTO_HASH2 FILES:=$(LINUX_DIR)/crypto/crypto_hash.ko - AUTOLOAD:=$(call AutoLoad,02,crypto_hash) + AUTOLOAD:=$(call AutoLoad,02,crypto_hash,1) $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-hash)) @@ -62,6 +62,22 @@ define KernelPackage/crypto-manager endef $(eval $(call KernelPackage,crypto-manager)) +define KernelPackage/crypto-user + TITLE:=CryptoAPI userspace interface + DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager + KCONFIG:= \ + CONFIG_CRYPTO_USER_API \ + CONFIG_CRYPTO_USER_API_HASH \ + CONFIG_CRYPTO_USER_API_SKCIPHER + FILES:= \ + $(LINUX_DIR)/crypto/af_alg.ko \ + $(LINUX_DIR)/crypto/algif_hash.ko \ + $(LINUX_DIR)/crypto/algif_skcipher.ko + AUTOLOAD:=$(call AutoLoad,09,af_alg algif_hash algif_skcipher) + $(call AddDepends/crypto) +endef +$(eval $(call KernelPackage,crypto-user)) + define KernelPackage/crypto-wq TITLE:=CryptoAPI work queue handling KCONFIG:=CONFIG_CRYPTO_WORKQUEUE @@ -138,23 +154,6 @@ endef $(eval $(call KernelPackage,crypto-hw-hifn-795x)) -define KernelPackage/crypto-hw-ixp4xx - TITLE:=Intel IXP4xx hardware crypto module - DEPENDS:=@TARGET_ixp4xx - KCONFIG:= \ - CONFIG_CRYPTO_DEV_IXP4XX - FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko - AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) - $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des) -endef - -define KernelPackage/crypto-hw-ixp4xx/description - Kernel support for the Intel IXP4xx HW crypto engine. -endef - -$(eval $(call KernelPackage,crypto-hw-ixp4xx)) - - define KernelPackage/crypto-hw-ppc4xx TITLE:=AMCC PPC4xx hardware crypto module DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x @@ -221,6 +220,17 @@ endef $(eval $(call KernelPackage,crypto-cbc)) +define KernelPackage/crypto-crc32c + TITLE:=CRC32c CRC module + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_CRC32C + FILES:=$(LINUX_DIR)/crypto/crc32c.ko + AUTOLOAD:=$(call AutoLoad,04,crc32c,1) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-crc32c)) + define KernelPackage/crypto-des TITLE:=DES/3DES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_DES @@ -233,7 +243,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-deflate TITLE:=Deflate compression CryptoAPI module - DEPENDS:=+kmod-zlib + DEPENDS:=+kmod-lib-zlib KCONFIG:=CONFIG_CRYPTO_DEFLATE FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,09,deflate) @@ -267,6 +277,18 @@ endef $(eval $(call KernelPackage,crypto-hmac)) +define KernelPackage/crypto-md4 + TITLE:=MD4 digest CryptoAPI module + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_MD4 + FILES:=$(LINUX_DIR)/crypto/md4.ko + AUTOLOAD:=$(call AutoLoad,09,md4) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-md4)) + + define KernelPackage/crypto-md5 TITLE:=MD5 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash @@ -312,10 +334,8 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_CAMELLIA \ CONFIG_CRYPTO_CAST5 \ CONFIG_CRYPTO_CAST6 \ - CONFIG_CRYPTO_CRC32C \ CONFIG_CRYPTO_FCRYPT \ CONFIG_CRYPTO_KHAZAD \ - CONFIG_CRYPTO_MD4 \ CONFIG_CRYPTO_SERPENT \ CONFIG_CRYPTO_SHA256 \ CONFIG_CRYPTO_SHA512 \ @@ -327,26 +347,22 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_WP512 FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ - $(LINUX_DIR)/crypto/blowfish.ko \ $(LINUX_DIR)/crypto/camellia.ko \ $(LINUX_DIR)/crypto/cast5.ko \ $(LINUX_DIR)/crypto/cast6.ko \ - $(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.ko) \ $(LINUX_DIR)/crypto/fcrypt.ko \ $(LINUX_DIR)/crypto/khazad.ko \ - $(LINUX_DIR)/crypto/md4.ko \ - $(LINUX_DIR)/crypto/serpent.ko \ $(LINUX_DIR)/crypto/sha256_generic.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tgr192.ko \ $(LINUX_DIR)/crypto/twofish_common.ko \ - $(LINUX_DIR)/crypto/wp512.ko - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),1) - FILES += $(LINUX_DIR)/crypto/twofish.ko - else - FILES += $(LINUX_DIR)/crypto/twofish_generic.ko - endif + $(LINUX_DIR)/crypto/wp512.ko \ + $(LINUX_DIR)/crypto/twofish_generic.ko + FILES += \ + $(LINUX_DIR)/crypto/blowfish_common.ko \ + $(LINUX_DIR)/crypto/blowfish_generic.ko \ + $(LINUX_DIR)/crypto/serpent_generic.ko $(call AddDepends/crypto) endef @@ -360,7 +376,7 @@ $(eval $(call KernelPackage,crypto-misc)) define KernelPackage/crypto-ocf TITLE:=OCF modules - DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager + DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @!TARGET_uml +kmod-crypto-manager KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -384,7 +400,7 @@ $(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 @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf + 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) @@ -396,7 +412,7 @@ $(eval $(call KernelPackage,crypto-ocf-hifn7751)) define KernelPackage/crypto-ocf-hifnhipp TITLE:=OCF support for Hifn 7855/8155 devices - DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf + 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)