X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fcrypto.mk;h=ca18a1605895c17a4458b08d2fd541690ea7126b;hp=062afe716828b6a8bcd2131e3a6286f776422d60;hb=9ed108e98baae4ed7fbb6c8dd0ed4bd68dd4dc31;hpb=4454a3fb6375cf1adf17f63a54cd7660bc40caa7 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 062afe7168..ca18a16058 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -27,7 +27,7 @@ define KernelPackage/crypto-aead CONFIG_CRYPTO_AEAD2 FILES:=$(LINUX_DIR)/crypto/aead.ko AUTOLOAD:=$(call AutoLoad,09,aead,1) - $(call AddDepends/crypto, +LINUX_4_4:kmod-crypto-null) + $(call AddDepends/crypto, +!LINUX_3_18:kmod-crypto-null) endef $(eval $(call KernelPackage,crypto-aead)) @@ -100,40 +100,53 @@ $(eval $(call KernelPackage,crypto-wq)) define KernelPackage/crypto-rng TITLE:=CryptoAPI random number generation - KCONFIG:=CONFIG_CRYPTO_RNG2 - FILES:=$(LINUX_DIR)/crypto/rng.ko -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.2.0)),1) - FILES+=$(LINUX_DIR)/crypto/krng.ko -endif - AUTOLOAD:=$(call AutoLoad,09,rng krng) + DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha256 + KCONFIG:= \ + CONFIG_CRYPTO_DRBG \ + CONFIG_CRYPTO_DRBG_HMAC=y \ + CONFIG_CRYPTO_DRBG_HASH=n \ + CONFIG_CRYPTO_DRBG_MENU \ + CONFIG_CRYPTO_JITTERENTROPY \ + CONFIG_CRYPTO_RNG2 + FILES:= \ + $(LINUX_DIR)/crypto/drbg.ko@ge4.2 \ + $(LINUX_DIR)/crypto/jitterentropy_rng.ko@ge4.2 \ + $(LINUX_DIR)/crypto/krng.ko@lt4.2 \ + $(LINUX_DIR)/crypto/rng.ko + AUTOLOAD:=$(call AutoLoad,09,drbg@ge4.2 jitterentropy_rng@ge4.2 krng@lt4.2 rng) $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-rng)) -define KernelPackage/crypto-rng-jitterentropy - TITLE:=Jitterentropy Non-Deterministic Random Number Generator - KCONFIG:=CONFIG_CRYPTO_JITTERENTROPY - FILES:= $(LINUX_DIR)/crypto/jitterentropy_rng.ko - AUTOLOAD:=$(call AutoLoad,10,jitterentropy-rng) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-rng-jitterentropy)) define KernelPackage/crypto-iv TITLE:=CryptoAPI initialization vectors DEPENDS:=+kmod-crypto-manager +kmod-crypto-rng +kmod-crypto-wq KCONFIG:= CONFIG_CRYPTO_BLKCIPHER2 + HIDDEN:=1 FILES:= \ - $(LINUX_DIR)/crypto/eseqiv.ko \ - $(LINUX_DIR)/crypto/chainiv.ko + $(LINUX_DIR)/crypto/eseqiv.ko@lt4.9 \ + $(LINUX_DIR)/crypto/chainiv.ko@lt4.9 AUTOLOAD:=$(call AutoLoad,10,eseqiv chainiv) $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-iv)) + +define KernelPackage/crypto-echainiv + TITLE:=Encrypted Chain IV Generator + DEPENDS:=+kmod-crypto-aead + KCONFIG:=CONFIG_CRYPTO_ECHAINIV + FILES:=$(LINUX_DIR)/crypto/echainiv.ko + AUTOLOAD:=$(call AutoLoad,09,echainiv) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-echainiv)) + + define KernelPackage/crypto-seqiv TITLE:=CryptoAPI Sequence Number IV Generator DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng @@ -151,7 +164,9 @@ define KernelPackage/crypto-hw-talitos DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc KCONFIG:= \ CONFIG_CRYPTO_HW=y \ - CONFIG_CRYPTO_DEV_TALITOS + CONFIG_CRYPTO_DEV_TALITOS \ + CONFIG_CRYPTO_DEV_TALITOS1=y \ + CONFIG_CRYPTO_DEV_TALITOS2=y FILES:= \ $(LINUX_DIR)/drivers/crypto/talitos.ko AUTOLOAD:=$(call AutoLoad,09,talitos) @@ -179,6 +194,24 @@ endef $(eval $(call KernelPackage,crypto-hw-padlock)) +define KernelPackage/crypto-hw-ccp + TITLE:=AMD Cryptographic Coprocessor + DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_CCP=y \ + CONFIG_CRYPTO_DEV_CCP_CRYPTO \ + CONFIG_CRYPTO_DEV_CCP_DD + FILES:= \ + $(LINUX_DIR)/drivers/crypto/ccp/ccp.ko \ + $(LINUX_DIR)/drivers/crypto/ccp/ccp-crypto.ko + AUTOLOAD:=$(call AutoLoad,09,ccp ccp-crypto) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-hw-ccp)) + + define KernelPackage/crypto-hw-geode TITLE:=AMD Geode hardware crypto module DEPENDS:=+kmod-crypto-manager @@ -208,57 +241,9 @@ endef $(eval $(call KernelPackage,crypto-hw-hifn-795x)) -define KernelPackage/crypto-hw-ppc4xx - TITLE:=AMCC PPC4xx hardware crypto module - DEPENDS:=@TARGET_ppc40x||TARGET_ppc44x - KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ - CONFIG_CRYPTO_DEV_PPC4XX - FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko - AUTOLOAD:=$(call AutoLoad,90,crypto4xx) - $(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash) -endef - -define KernelPackage/crypto-hw-ppc4xx/description - Kernel support for the AMCC PPC4xx HW crypto engine. -endef - -$(eval $(call KernelPackage,crypto-hw-ppc4xx)) - - -define KernelPackage/crypto-hw-omap - TITLE:=TI OMAP hardware crypto modules - DEPENDS:=@TARGET_omap - KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ - CONFIG_CRYPTO_DEV_OMAP_AES \ - CONFIG_CRYPTO_DEV_OMAP_DES \ - CONFIG_CRYPTO_DEV_OMAP_SHAM -ifneq ($(wildcard $(LINUX_DIR)/drivers/crypto/omap-des.ko),) - FILES:= \ - $(LINUX_DIR)/drivers/crypto/omap-aes.ko \ - $(LINUX_DIR)/drivers/crypto/omap-des.ko \ - $(LINUX_DIR)/drivers/crypto/omap-sham.ko - AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-des omap-sham) -else - FILES:= \ - $(LINUX_DIR)/drivers/crypto/omap-aes.ko \ - $(LINUX_DIR)/drivers/crypto/omap-sham.ko - AUTOLOAD:=$(call AutoLoad,90,omap-aes omap-sham) -endif - $(call AddDepends/crypto,+kmod-crypto-manager +kmod-crypto-hash) -endef - -define KernelPackage/crypto-hw-omap/description - Kernel support for the TI OMAP HW crypto engine. -endef - -$(eval $(call KernelPackage,crypto-hw-omap)) - - define KernelPackage/crypto-authenc TITLE:=Combined mode wrapper for IPsec - DEPENDS:=+kmod-crypto-manager +LINUX_4_4:kmod-crypto-null + DEPENDS:=+kmod-crypto-manager +!LINUX_3_18:kmod-crypto-null KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.ko AUTOLOAD:=$(call AutoLoad,09,authenc) @@ -336,7 +321,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-deflate TITLE:=Deflate compression CryptoAPI module - DEPENDS:=+kmod-lib-zlib + DEPENDS:=+kmod-lib-zlib-inflate +kmod-lib-zlib-deflate KCONFIG:=CONFIG_CRYPTO_DEFLATE FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,09,deflate) @@ -475,7 +460,8 @@ define KernelPackage/crypto-sha1 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA1 \ - CONFIG_CRYPTO_SHA1_OCTEON + CONFIG_CRYPTO_SHA1_OCTEON \ + CONFIG_CRYPTO_SHA1_SSSE3 FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha1_generic) $(call AddDepends/crypto) @@ -486,6 +472,11 @@ define KernelPackage/crypto-sha1/octeon AUTOLOAD:=$(call AutoLoad,09,octeon-sha1) endef +define KernelPackage/crypto-sha1/x86/64 + FILES+=$(LINUX_DIR)/arch/x86/crypto/sha1-ssse3.ko + AUTOLOAD:=$(call AutoLoad,09,sha1-ssse3) +endef + $(eval $(call KernelPackage,crypto-sha1)) @@ -494,7 +485,8 @@ define KernelPackage/crypto-sha256 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA256 \ - CONFIG_CRYPTO_SHA256_OCTEON + CONFIG_CRYPTO_SHA256_OCTEON \ + CONFIG_CRYPTO_SHA256_SSSE3 FILES:=$(LINUX_DIR)/crypto/sha256_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha256_generic) $(call AddDepends/crypto) @@ -505,6 +497,11 @@ define KernelPackage/crypto-sha256/octeon AUTOLOAD:=$(call AutoLoad,09,octeon-sha256) endef +define KernelPackage/crypto-sha256/x86/64 + FILES+=$(LINUX_DIR)/arch/x86/crypto/sha256-ssse3.ko + AUTOLOAD:=$(call AutoLoad,09,sha256-ssse3) +endef + $(eval $(call KernelPackage,crypto-sha256)) @@ -513,7 +510,8 @@ define KernelPackage/crypto-sha512 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA512 \ - CONFIG_CRYPTO_SHA512_OCTEON + CONFIG_CRYPTO_SHA512_OCTEON \ + CONFIG_CRYPTO_SHA512_SSSE3 FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha512_generic) $(call AddDepends/crypto) @@ -524,6 +522,11 @@ define KernelPackage/crypto-sha512/octeon AUTOLOAD:=$(call AutoLoad,09,octeon-sha512) endef +define KernelPackage/crypto-sha512/x86/64 + FILES+=$(LINUX_DIR)/arch/x86/crypto/sha512-ssse3.ko + AUTOLOAD:=$(call AutoLoad,09,sha512-ssse3) +endef + $(eval $(call KernelPackage,crypto-sha512)) @@ -572,54 +575,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 @@ -651,15 +606,3 @@ define KernelPackage/crypto-xts endef $(eval $(call KernelPackage,crypto-xts)) - - -define KernelPackage/crypto-mv-cesa - TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu - KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA - FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko - AUTOLOAD:=$(call AutoLoad,09,mv_cesa) - $(call AddDepends/crypto) -endef - -$(eval $(call KernelPackage,crypto-mv-cesa))