X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fcrypto.mk;h=d84c802f91a37b02c13f521c2f03a49a9efabcce;hb=33d1b2e0f526d7f774980f5557259793b6a4704c;hp=7d47aed9cacc4b6ba162a52f580cbdaba205c38c;hpb=7ae1c1b4e8fd176aa9add1c7009d52f1cbbf1878;p=librecmc%2Flibrecmc.git diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 7d47aed9ca..d84c802f91 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 @@ -41,8 +26,8 @@ define KernelPackage/crypto-aead CONFIG_CRYPTO_AEAD \ CONFIG_CRYPTO_AEAD2 FILES:=$(LINUX_DIR)/crypto/aead.ko - AUTOLOAD:=$(call AutoLoad,09,crypto_aead,1) - $(call AddDepends/crypto) + AUTOLOAD:=$(call AutoLoad,09,aead,1) + $(call AddDepends/crypto, +LINUX_4_3:kmod-crypto-null +LINUX_4_4:kmod-crypto-null) endef $(eval $(call KernelPackage,crypto-aead)) @@ -66,6 +51,7 @@ define KernelPackage/crypto-manager CONFIG_CRYPTO_MANAGER \ CONFIG_CRYPTO_MANAGER2 FILES:=$(LINUX_DIR)/crypto/cryptomgr.ko + AUTOLOAD:=$(call AutoLoad,09,cryptomgr,1) $(call AddDepends/crypto) endef @@ -114,11 +100,18 @@ $(eval $(call KernelPackage,crypto-wq)) define KernelPackage/crypto-rng TITLE:=CryptoAPI random number generation - KCONFIG:=CONFIG_CRYPTO_RNG2 + DEPENDS:=+kmod-crypto-hash + KCONFIG:= \ + CONFIG_CRYPTO_DRBG_MENU \ + CONFIG_CRYPTO_DRBG \ + CONFIG_CRYPTO_JITTERENTROPY \ + CONFIG_CRYPTO_RNG2 FILES:= \ - $(LINUX_DIR)/crypto/rng.ko \ - $(LINUX_DIR)/crypto/krng.ko - AUTOLOAD:=$(call AutoLoad,09,rng krng) + $(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 @@ -152,8 +145,9 @@ $(eval $(call KernelPackage,crypto-seqiv)) define KernelPackage/crypto-hw-talitos TITLE:=Freescale integrated security engine (SEC) driver - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc + DEPENDS:=+kmod-crypto-manager +kmod-crypto-hash +kmod-random-core +kmod-crypto-authenc KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_TALITOS FILES:= \ $(LINUX_DIR)/drivers/crypto/talitos.ko @@ -166,8 +160,9 @@ $(eval $(call KernelPackage,crypto-hw-talitos)) define KernelPackage/crypto-hw-padlock TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=+kmod-crypto-aes +kmod-crypto-manager + DEPENDS:=+kmod-crypto-manager KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK_AES \ CONFIG_CRYPTO_DEV_PADLOCK_SHA @@ -185,6 +180,7 @@ define KernelPackage/crypto-hw-geode TITLE:=AMD Geode hardware crypto module DEPENDS:=+kmod-crypto-manager KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko AUTOLOAD:=$(call AutoLoad,09,geode-aes) @@ -198,6 +194,7 @@ define KernelPackage/crypto-hw-hifn-795x TITLE:=HIFN 795x crypto accelerator DEPENDS:=+kmod-random-core +kmod-crypto-manager KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.ko @@ -212,6 +209,7 @@ 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) @@ -229,6 +227,7 @@ 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 @@ -254,38 +253,9 @@ endef $(eval $(call KernelPackage,crypto-hw-omap)) -define KernelPackage/crypto-aes - TITLE:=AES cipher CryptoAPI module - KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes_generic.ko - AUTOLOAD:=$(call AutoLoad,09,aes_generic) - $(call AddDepends/crypto) -endef - -ifndef CONFIG_TARGET_x86_64 - define KernelPackage/crypto-aes/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko - AUTOLOAD:=$(call AutoLoad,09,aes-i586) - endef -endif - -$(eval $(call KernelPackage,crypto-aes)) - - -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 + DEPENDS:=+kmod-crypto-manager +LINUX_4_4:kmod-crypto-null KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.ko AUTOLOAD:=$(call AutoLoad,09,authenc) @@ -307,7 +277,7 @@ $(eval $(call KernelPackage,crypto-cbc)) define KernelPackage/crypto-ctr TITLE:=Counter Mode CryptoAPI module - DEPENDS:=+kmod-crypto-manager +kmod-crypto-seqiv + DEPENDS:=+kmod-crypto-manager +kmod-crypto-seqiv +kmod-crypto-iv KCONFIG:=CONFIG_CRYPTO_CTR FILES:=$(LINUX_DIR)/crypto/ctr.ko AUTOLOAD:=$(call AutoLoad,09,ctr) @@ -342,10 +312,8 @@ define KernelPackage/crypto-crc32c TITLE:=CRC32c CRC module DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32C - FILES:= \ - $(LINUX_DIR)/crypto/crc32c.ko@lt3.15 \ - $(LINUX_DIR)/crypto/crc32c_generic.ko@ge3.15 - AUTOLOAD:=$(call AutoLoad,04,crc32c@lt3.15 crc32c_generic@ge3.15,1) + FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko + AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1) $(call AddDepends/crypto) endef @@ -399,10 +367,9 @@ $(eval $(call KernelPackage,crypto-ecb)) define KernelPackage/crypto-hmac TITLE:=HMAC digest CryptoAPI module - DEPENDS:=+kmod-crypto-hash + DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager KCONFIG:=CONFIG_CRYPTO_HMAC FILES:=$(LINUX_DIR)/crypto/hmac.ko - DEPENDS:=+kmod-crypto-manager AUTOLOAD:=$(call AutoLoad,09,hmac) $(call AddDepends/crypto) endef @@ -410,6 +377,18 @@ endef $(eval $(call KernelPackage,crypto-hmac)) +define KernelPackage/crypto-cmac + TITLE:=Support for Cipher-based Message Authentication Code (CMAC) + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_CMAC + FILES:=$(LINUX_DIR)/crypto/cmac.ko + AUTOLOAD:=$(call AutoLoad,09,cmac) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-cmac)) + + define KernelPackage/crypto-gcm TITLE:=GCM/GMAC CryptoAPI module DEPENDS:=+kmod-crypto-ctr +kmod-crypto-ghash +kmod-crypto-null @@ -460,12 +439,19 @@ $(eval $(call KernelPackage,crypto-md4)) define KernelPackage/crypto-md5 TITLE:=MD5 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_MD5 + KCONFIG:= \ + CONFIG_CRYPTO_MD5 \ + CONFIG_CRYPTO_MD5_OCTEON FILES:=$(LINUX_DIR)/crypto/md5.ko AUTOLOAD:=$(call AutoLoad,09,md5) $(call AddDepends/crypto) endef +define KernelPackage/crypto-md5/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-md5.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-md5) +endef + $(eval $(call KernelPackage,crypto-md5)) @@ -484,27 +470,60 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 TITLE:=SHA1 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_SHA1 + KCONFIG:= \ + CONFIG_CRYPTO_SHA1 \ + CONFIG_CRYPTO_SHA1_OCTEON FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha1_generic) $(call AddDepends/crypto) endef +define KernelPackage/crypto-sha1/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha1.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha1) +endef + $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-sha256 TITLE:=SHA224 SHA256 digest CryptoAPI module DEPENDS:=+kmod-crypto-hash - KCONFIG:=CONFIG_CRYPTO_SHA256 + KCONFIG:= \ + CONFIG_CRYPTO_SHA256 \ + CONFIG_CRYPTO_SHA256_OCTEON FILES:=$(LINUX_DIR)/crypto/sha256_generic.ko AUTOLOAD:=$(call AutoLoad,09,sha256_generic) $(call AddDepends/crypto) endef +define KernelPackage/crypto-sha256/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha256.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha256) +endef + $(eval $(call KernelPackage,crypto-sha256)) +define KernelPackage/crypto-sha512 + TITLE:=SHA512 digest CryptoAPI module + DEPENDS:=+kmod-crypto-hash + KCONFIG:= \ + CONFIG_CRYPTO_SHA512 \ + CONFIG_CRYPTO_SHA512_OCTEON + FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko + AUTOLOAD:=$(call AutoLoad,09,sha512_generic) + $(call AddDepends/crypto) +endef + +define KernelPackage/crypto-sha512/octeon + FILES+=$(LINUX_DIR)/arch/mips/cavium-octeon/crypto/octeon-sha512.ko + AUTOLOAD:=$(call AutoLoad,09,octeon-sha512) +endef + +$(eval $(call KernelPackage,crypto-sha512)) + + define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules DEPENDS:=+kmod-crypto-manager @@ -517,7 +536,6 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_FCRYPT \ CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_SERPENT \ - CONFIG_CRYPTO_SHA512 \ CONFIG_CRYPTO_TEA \ CONFIG_CRYPTO_TGR192 \ CONFIG_CRYPTO_TWOFISH \ @@ -531,7 +549,6 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/cast5_generic.ko \ $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ - $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tgr192.ko \ $(LINUX_DIR)/crypto/twofish_common.ko \ @@ -605,7 +622,7 @@ define KernelPackage/crypto-null KCONFIG:=CONFIG_CRYPTO_NULL FILES:=$(LINUX_DIR)/crypto/crypto_null.ko AUTOLOAD:=$(call AutoLoad,09,crypto_null) - $(call AddDepends/crypto,+kmod-crypto-manager) + $(call AddDepends/crypto, +kmod-crypto-hash) endef $(eval $(call KernelPackage,crypto-null)) @@ -635,7 +652,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu + 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)