X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e41e39fc1ce9a24059895e2f79f754465f512b69..c03ed13f88ddea0af500f9b765ff52fb4965c981:/package/kernel/modules/crypto.mk diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 6675d5edf..1e15f45a3 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -1,188 +1,241 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ CRYPTO_MENU:=Cryptographic API modules -# XXX: added CRYPTO_GENERIC as a workaround for modules renamed in 2.6.24: -# - aes > aes_generic -# - des > des_generic -# - sha1 > sha1_generic -# - sha256 > sha256_generic -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) - CRYPTO_GENERIC:=_generic -endif - -# XXX: added CRYPTO_PREFIX as a workaround for modules renamed in 2.6.25: -# - blkcipher -> crypto_blkcipher -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1) - CRYPTO_PREFIX:=crypto_ -endif - -# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is +# XXX: added workarounds for modules renamed in 2.6 series: +# - aes > aes_generic (2.6.24) +# - blkcipher -> crypto_blkcipher (2.6.25) +# - des > des_generic (2.6.24) +# - sha1 > sha1_generic (2.6.24) +# - sha256 > sha256_generic (2.6.24) +# - sha512 > sha512_generic (2.6.26) +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 \ + AEAD2=aead \ + PCOMP=pcompress \ + BLKCIPHER2=crypto_blkcipher \ + HASH2=crypto_hash \ + MANAGER2=cryptomgr \ + CBC=cbc \ + ECB=ecb \ + 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))).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 # 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/$(CRYPTO_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 \ - $(CRYPTO_PREFIX)blkcipher \ - cbc \ - ecb \ - deflate \ - ) + KCONFIG:=CONFIG_CRYPTO=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 $(eval $(call KernelPackage,crypto-core)) -define KernelPackage/crypto-aes +define AddDepends/crypto SUBMENU:=$(CRYPTO_MENU) - TITLE:=AES cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core + DEPENDS+=kmod-crypto-core $(1) +endef + + +define KernelPackage/crypto-hw-padlock + TITLE:=VIA PadLock ACE with AES/SHA hw crypto module KCONFIG:= \ - CONFIG_CRYPTO_AES \ - CONFIG_CRYPTO_AES_586 - FILES:=$(LINUX_DIR)/crypto/aes$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,aes$(CRYPTO_GENERIC)) + 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.ko \ + $(LINUX_DIR)/drivers/crypto/padlock-sha.ko + AUTOLOAD:=$(call AutoLoad,09,padlock-aes padlock-sha) + $(call AddDepends/crypto) 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) +$(eval $(call KernelPackage,crypto-hw-padlock)) + + +define KernelPackage/crypto-hw-geode + TITLE:=AMD Geode hardware crypto module + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_GEODE + FILES:=$(LINUX_DIR)/drivers/crypto/geode-aes.ko + AUTOLOAD:=$(call AutoLoad,09,geode-aes) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-hw-geode)) + + +define KernelPackage/crypto-hw-hifn-795x + TITLE:=HIFN 795x crypto accelerator + 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.ko + AUTOLOAD:=$(call AutoLoad,09,hifn_795x) + $(call AddDepends/crypto,+kmod-crypto-des) +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_HW=y \ + 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 + 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) +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-aes + TITLE:=AES cipher CryptoAPI module + KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 + 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.ko + AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX) aes-i586) endef $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 - SUBMENU:=$(CRYPTO_MENU) TITLE:=ARC4 (RC4) cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core 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 $(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 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 $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des - SUBMENU:=$(CRYPTO_MENU) TITLE:=DES/3DES cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_DES - FILES:=$(LINUX_DIR)/crypto/des$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,des$(CRYPTO_GENERIC)) + FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).ko + AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac - SUBMENU:=$(CRYPTO_MENU) TITLE:=HMAC digest CryptoAPI module - DEPENDS:=+kmod-crypto-core 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 $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 - SUBMENU:=$(CRYPTO_MENU) TITLE:=MD5 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core 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 $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic - SUBMENU:=$(CRYPTO_MENU) TITLE:=Michael MIC keyed digest CryptoAPI module - DEPENDS:=+kmod-crypto-core 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 $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 - SUBMENU:=$(CRYPTO_MENU) TITLE:=SHA1 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_SHA1 - FILES:=$(LINUX_DIR)/crypto/sha1$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,sha1$(CRYPTO_GENERIC)) + FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).ko + AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-misc - SUBMENU:=$(CRYPTO_MENU) TITLE:=Other CryptoAPI modules - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_ANUBIS \ CONFIG_CRYPTO_BLOWFISH \ @@ -199,37 +252,44 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_TEA \ CONFIG_CRYPTO_TGR192 \ CONFIG_CRYPTO_TWOFISH \ + CONFIG_CRYPTO_TWOFISH_COMMON \ 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$(CRYPTO_GENERIC).$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/sha512.$(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 \ + $(LINUX_DIR)/crypto/twofish.ko \ + $(LINUX_DIR)/crypto/wp512.ko + $(call AddDepends/crypto) endef define KernelPackage/crypto-misc/2.6 FILES+= \ - $(LINUX_DIR)/crypto/camellia.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/fcrypt.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/crypto/tgr192.$(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.ko endef $(eval $(call KernelPackage,crypto-misc)) + define KernelPackage/crypto-ocf - SUBMENU:=$(CRYPTO_MENU) TITLE:=OCF modules - DEPENDS:=+kmod-crypto-core @!TARGET_uml + DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -237,38 +297,60 @@ 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 \ 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 @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 @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 - SUBMENU:=$(CRYPTO_MENU) TITLE:=Null CryptoAPI module - DEPENDS:=+kmod-crypto-core 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 $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test - SUBMENU:=$(CRYPTO_MENU) TITLE:=Test CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_TEST - FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,09,tcrypt) + FILES:=$(LINUX_DIR)/crypto/tcrypt.ko + $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-test))