X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=89ab2d388586ecbdc13f4b0c84039b2be3213cbe;hp=57018218a8ea982890032db1bb27efc2f8f20b89;hb=8a82b9131798f9587e42ee7044d091006c54c0c4;hpb=a49e6e48d052f9917355251f8ff3fec5561450ae diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 57018218a8..89ab2d3885 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -30,38 +30,29 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1) SHA512_SUFFIX:=$(CRYPTO_GENERIC) endif -# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is +CRYPTO_MODULES = \ + ALGAPI=crypto_algapi \ + AEAD=aead \ + BLKCIPHER=$(BLKCIPHER_PREFIX)blkcipher \ + MANAGER=cryptomgr \ + HASH=crypto_hash \ + CBC=cbc \ + ECB=ecb \ + HMAC=hmac \ + DEFLATE=deflate + +crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) +crypto_file=$(if $($(call crypto_confvar,$(1))),$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX)) +crypto_name=$(if $($(call crypto_confvar,$(1))),$(word 2,$(subst =,$(space),$(1)))) + +# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is # always set, even if no hash modules are selected define KernelPackage/crypto-core SUBMENU:=$(CRYPTO_MENU) TITLE:=Core CryptoAPI modules - KCONFIG:= \ - CONFIG_CRYPTO=y \ - CONFIG_CRYPTO_ALGAPI \ - CONFIG_CRYPTO_BLKCIPHER \ - CONFIG_CRYPTO_CBC \ - CONFIG_CRYPTO_DEFLATE \ - CONFIG_CRYPTO_ECB \ - CONFIG_CRYPTO_HASH \ - CONFIG_CRYPTO_HMAC \ - CONFIG_CRYPTO_MANAGER - FILES:= \ - $(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/$(BLKCIPHER_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/crypto_hash.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/cryptomgr.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,01, \ - crypto_algapi \ - cryptomgr \ - crypto_hash \ - $(BLKCIPHER_PREFIX)blkcipher \ - cbc \ - ecb \ - deflate \ - ) + KCONFIG:=CONFIG_CRYPTO=y $(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_file,$(mod)))) endef define KernelPackage/crypto-core/2.4 @@ -72,21 +63,83 @@ endef $(eval $(call KernelPackage,crypto-core)) +define KernelPackage/crypto-hw-padlock + SUBMENU:=$(CRYPTO_MENU) + TITLE:=VIA PadLock ACE with AES/SHA hw crypto module + DEPENDS:=+kmod-crypto-core + 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) + AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha) +endef + +$(eval $(call KernelPackage,crypto-hw-padlock)) + + +define KernelPackage/crypto-hw-geode + SUBMENU:=$(CRYPTO_MENU) + TITLE:=AMD Geode hardware crypto module + DEPENDS:=+kmod-crypto-core + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_GEODE + FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,09,geode-aes) +endef + +$(eval $(call KernelPackage,crypto-hw-geode)) + + +define KernelPackage/crypto-hw-hifn-795x + SUBMENU:=$(CRYPTO_MENU) + TITLE:=HIFN 795x crypto accelerator + DEPENDS:=+kmod-crypto-core +kmod-crypto-des + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_HIFN_795X \ + CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y + FILES:=$(LINUX_DIR)/drivers/crypto/hifn_795x.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,09,hifn_795x) +endef + +$(eval $(call KernelPackage,crypto-hw-hifn-795x)) + + +define KernelPackage/crypto-hw-ixp4xx + SUBMENU:=$(CRYPTO_MENU) + TITLE:=Intel IXP4xx hardware crypto module + DEPENDS:= \ + @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc + KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX + FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) +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-aes SUBMENU:=$(CRYPTO_MENU) TITLE:=AES cipher CryptoAPI module DEPENDS:=+kmod-crypto-core - KCONFIG:= \ - CONFIG_CRYPTO_AES \ - CONFIG_CRYPTO_AES_586 + KCONFIG:=CONFIG_CRYPTO_AES FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX)) endef define KernelPackage/crypto-aes/x86-2.6 - KCONFIG:=CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,aes-i586) + KCONFIG+=CONFIG_CRYPTO_AES_586 + FILES+=$(LINUX_DIR)/arch/x86/crypto/aes-i586.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586) endef $(eval $(call KernelPackage,crypto-aes)) @@ -104,21 +157,10 @@ endef $(eval $(call KernelPackage,crypto-arc4)) -define KernelPackage/crypto-aead - SUBMENU:=$(CRYPTO_MENU) - TITLE:=Authenticated Encryption with Associated Data - DEPENDS:=+kmod-crypto-core - KCONFIG:=CONFIG_CRYPTO_AEAD - FILES:=$(LINUX_DIR)/crypto/aead.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,aead) -endef - -$(eval $(call KernelPackage,crypto-aead)) - define KernelPackage/crypto-authenc SUBMENU:=$(CRYPTO_MENU) TITLE:=Combined mode wrapper for IPsec - DEPENDS:=+kmod-crypto-core +kmod-crypto-aead + DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,authenc) @@ -275,7 +317,6 @@ define KernelPackage/crypto-test DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_TEST FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,tcrypt) endef $(eval $(call KernelPackage,crypto-test))