X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=dc0c8b4fc7b8d8ff5ab42d36f0463b78390b3fbc;hp=a371e96116f6426314e91abac09ce889af0d28ea;hb=24c8c78f19ccc1f3264062ccbecbaf33675e2da0;hpb=0207e00bad48d6b5d27e2c739bd2d2b9199e5d9e diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index a371e96116..dc0c8b4fc7 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -14,19 +14,17 @@ CRYPTO_MENU:=Cryptographic API modules # - sha1 > sha1_generic (2.6.24) # - sha256 > sha256_generic (2.6.24) # - sha512 > sha512_generic (2.6.26) -ifneq ($(CONFIG_LINUX_2_6),) - CRYPTO_GENERIC:=_generic - AES_SUFFIX:=$(CRYPTO_GENERIC) - DES_SUFFIX:=$(CRYPTO_GENERIC) - SHA1_SUFFIX:=$(CRYPTO_GENERIC) - SHA256_SUFFIX:=$(CRYPTO_GENERIC) - SHA512_SUFFIX:=$(CRYPTO_GENERIC) -endif +CRYPTO_GENERIC:=_generic +AES_SUFFIX:=$(CRYPTO_GENERIC) +DES_SUFFIX:=$(CRYPTO_GENERIC) +SHA1_SUFFIX:=$(CRYPTO_GENERIC) +SHA256_SUFFIX:=$(CRYPTO_GENERIC) +SHA512_SUFFIX:=$(CRYPTO_GENERIC) CRYPTO_MODULES = \ - ALGAPI=crypto_algapi \ + $(if $(filter 1,$(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),ALGAPI2,ALGAPI)=crypto_algapi \ AEAD2=aead \ - PCOMP=pcompress \ + $(if $(filter 1,$(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),PCOMP2,PCOMP)=pcompress \ BLKCIPHER2=crypto_blkcipher \ HASH2=crypto_hash \ MANAGER2=cryptomgr \ @@ -35,7 +33,7 @@ CRYPTO_MODULES = \ DEFLATE=deflate crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) -crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX)) +crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko) crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is @@ -43,13 +41,17 @@ crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subs define KernelPackage/crypto-core SUBMENU:=$(CRYPTO_MENU) TITLE:=Core CryptoAPI modules - KCONFIG:=CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) + KCONFIG:= \ + CONFIG_CRYPTO=y \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_HMAC \ + $(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)))) endef define KernelPackage/crypto-core/2.4 - FILES:=$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/deflate.ko AUTOLOAD:=$(call AutoLoad,01, deflate) endef @@ -64,15 +66,14 @@ endef define KernelPackage/crypto-hw-padlock TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=@LINUX_2_6 + DEPENDS:=+kmod-crypto-aes KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PADLOCK \ CONFIG_CRYPTO_DEV_PADLOCK_AES \ CONFIG_CRYPTO_DEV_PADLOCK_SHA FILES:= \ - $(LINUX_DIR)/drivers/crypto/padlock-aes.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/crypto/padlock-sha.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/crypto/padlock-aes.ko \ + $(LINUX_DIR)/drivers/crypto/padlock-sha.ko AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha) $(call AddDepends/crypto) endef @@ -82,11 +83,9 @@ $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode TITLE:=AMD Geode hardware crypto module - DEPENDS:=@LINUX_2_6 KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE - FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko AUTOLOAD:=$(call AutoLoad,09,geode-aes) $(call AddDepends/crypto) endef @@ -96,13 +95,12 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x TITLE:=HIFN 795x crypto accelerator - DEPENDS:=@LINUX_2_6 @!TARGET_ubicom32 + DEPENDS:=@!TARGET_ubicom32 KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ CONFIG_HW_RANDOM=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y - FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.ko AUTOLOAD:=$(call AutoLoad,09,hifn_795x) $(call AddDepends/crypto,+kmod-crypto-des) endef @@ -114,9 +112,8 @@ define KernelPackage/crypto-hw-ixp4xx TITLE:=Intel IXP4xx hardware crypto module DEPENDS:=@TARGET_ixp4xx KCONFIG:= \ - CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_IXP4XX - FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.ko AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) $(call AddDepends/crypto,+kmod-crypto-authenc +kmod-crypto-des) endef @@ -132,9 +129,8 @@ 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.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.ko AUTOLOAD:=$(call AutoLoad,90,crypto4xx) $(call AddDepends/crypto) endef @@ -149,13 +145,13 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx)) define KernelPackage/crypto-aes TITLE:=AES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX)) $(call AddDepends/crypto) endef define KernelPackage/crypto-aes/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX) + FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.ko AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586) endef @@ -165,7 +161,7 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 TITLE:=ARC4 (RC4) cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_ARC4 - FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/arc4.ko AUTOLOAD:=$(call AutoLoad,09,arc4) $(call AddDepends/crypto) endef @@ -176,7 +172,7 @@ $(eval $(call KernelPackage,crypto-arc4)) define KernelPackage/crypto-authenc TITLE:=Combined mode wrapper for IPsec KCONFIG:=CONFIG_CRYPTO_AUTHENC - FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/authenc.ko AUTOLOAD:=$(call AutoLoad,09,authenc) $(call AddDepends/crypto) endef @@ -186,7 +182,7 @@ $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des TITLE:=DES/3DES cipher CryptoAPI module KCONFIG:=CONFIG_CRYPTO_DES - FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) $(call AddDepends/crypto) endef @@ -197,7 +193,7 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac TITLE:=HMAC digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_HMAC - FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/hmac.ko AUTOLOAD:=$(call AutoLoad,09,hmac) $(call AddDepends/crypto) endef @@ -208,7 +204,7 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 TITLE:=MD5 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MD5 - FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/md5.ko AUTOLOAD:=$(call AutoLoad,09,md5) $(call AddDepends/crypto) endef @@ -219,7 +215,7 @@ $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic TITLE:=Michael MIC keyed digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC - FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/michael_mic.ko AUTOLOAD:=$(call AutoLoad,09,michael_mic) $(call AddDepends/crypto) endef @@ -230,7 +226,7 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 TITLE:=SHA1 digest CryptoAPI module KCONFIG:=CONFIG_CRYPTO_SHA1 - FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).ko AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) $(call AddDepends/crypto) endef @@ -260,32 +256,33 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_TWOFISH_586 \ CONFIG_CRYPTO_WP512 FILES:= \ - $(LINUX_DIR)/crypto/anubis.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/blowfish.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cast5.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cast6.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/khazad.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/md4.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/serpent.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/tea.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/twofish.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/wp512.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/anubis.ko \ + $(LINUX_DIR)/crypto/blowfish.ko \ + $(LINUX_DIR)/crypto/cast5.ko \ + $(LINUX_DIR)/crypto/cast6.ko \ + $(LINUX_DIR)/crypto/khazad.ko \ + $(LINUX_DIR)/crypto/md4.ko \ + $(LINUX_DIR)/crypto/serpent.ko \ + $(LINUX_DIR)/crypto/sha256$(SHA256_SUFFIX).ko \ + $(LINUX_DIR)/crypto/sha512$(SHA512_SUFFIX).ko \ + $(LINUX_DIR)/crypto/tea.ko \ + $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),,$(LINUX_DIR)/crypto/twofish.ko) \ + $(if $(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)),,$(LINUX_DIR)/crypto/twofish_generic.ko) \ + $(LINUX_DIR)/crypto/wp512.ko $(call AddDepends/crypto) endef define KernelPackage/crypto-misc/2.6 FILES+= \ - $(LINUX_DIR)/crypto/camellia.$(LINUX_KMOD_SUFFIX) \ - $(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX)) \ - $(LINUX_DIR)/crypto/fcrypt.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/tgr192.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/twofish_common.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/camellia.ko \ + $(if $(findstring y,$(CONFIG_CRYPTO_CRC32C)),,$(LINUX_DIR)/crypto/crc32c.ko) \ + $(LINUX_DIR)/crypto/fcrypt.ko \ + $(LINUX_DIR)/crypto/tgr192.ko \ + $(LINUX_DIR)/crypto/twofish_common.ko endef define KernelPackage/crypto-misc/x86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.$(LINUX_KMOD_SUFFIX) + FILES+=$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko endef $(eval $(call KernelPackage,crypto-misc)) @@ -301,9 +298,9 @@ define KernelPackage/crypto-ocf CONFIG_OCF_FIPS=y \ CONFIG_OCF_RANDOMHARVEST=y FILES:= \ - $(LINUX_DIR)/crypto/ocf/ocf.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/ocf/cryptodev.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/ocf/cryptosoft.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/crypto/ocf/ocf.ko \ + $(LINUX_DIR)/crypto/ocf/cryptodev.ko \ + $(LINUX_DIR)/crypto/ocf/cryptosoft.ko AUTOLOAD:=$(call AutoLoad,09, \ ocf \ cryptodev \ @@ -319,7 +316,7 @@ 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 KCONFIG:=CONFIG_OCF_HIFN - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko AUTOLOAD:=$(call AutoLoad,10,hifn7751) $(call AddDepends/crypto) endef @@ -331,7 +328,7 @@ define KernelPackage/crypto-ocf-hifnhipp TITLE:=OCF support for Hifn 7855/8155 devices DEPENDS:=+@OPENSSL_ENGINE @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf KCONFIG:=CONFIG_OCF_HIFNHIPP - FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko AUTOLOAD:=$(call AutoLoad,10,hifnhipp) $(call AddDepends/crypto) endef @@ -342,7 +339,7 @@ $(eval $(call KernelPackage,crypto-ocf-hifnhipp)) define KernelPackage/crypto-null TITLE:=Null CryptoAPI module KCONFIG:=CONFIG_CRYPTO_NULL - FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/crypto_null.ko AUTOLOAD:=$(call AutoLoad,09,crypto_null) $(call AddDepends/crypto) endef @@ -353,9 +350,37 @@ $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test TITLE:=Test CryptoAPI module KCONFIG:=CONFIG_CRYPTO_TEST - FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/tcrypt.ko $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-test)) + +define KernelPackage/crypto-xts + TITLE:=XTS cipher CryptoAPI module + KCONFIG:= \ + CONFIG_CRYPTO_GF128MUL \ + CONFIG_CRYPTO_XTS + FILES:= \ + $(LINUX_DIR)/crypto/xts.ko \ + $(LINUX_DIR)/crypto/gf128mul.ko + AUTOLOAD:=$(call AutoLoad,09, \ + gf128mul \ + xts \ + ) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-xts)) + +define KernelPackage/crypto-mv-cesa + TITLE:=Marvell crypto engine + KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA + FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko + AUTOLOAD:=$(call AutoLoad,09,mv_cesa) + SUBMENU:=Cryptographic API modules + DEPENDS:=kmod-crypto-core @TARGET_kirkwood||TARGET_orion +endef + +$(eval $(call KernelPackage,crypto-mv-cesa))