X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=ee88eee3436a308f321d7d3a5a7a4a5eed68940e;hp=0b77c1da62f487f5bf900ad022c666789acdf2b0;hb=0e471d973e573aee6edbe2b9135bec19c4e4c75c;hpb=6926b43f4be0b9bbd42b0c805c8ae8a4ca8d415f diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 0b77c1da62..ee88eee343 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ CRYPTO_MENU:=Cryptographic API modules @@ -15,53 +14,45 @@ CRYPTO_MENU:=Cryptographic API modules # - sha1 > sha1_generic (2.6.24) # - sha256 > sha256_generic (2.6.24) # - sha512 > sha512_generic (2.6.26) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) - CRYPTO_GENERIC:=_generic - AES_SUFFIX:=$(CRYPTO_GENERIC) - DES_SUFFIX:=$(CRYPTO_GENERIC) - SHA1_SUFFIX:=$(CRYPTO_GENERIC) - SHA256_SUFFIX:=$(CRYPTO_GENERIC) -endif ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1) CRYPTO_PREFIX:=crypto_ BLKCIPHER_PREFIX:=$(CRYPTO_PREFIX) endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1) - SHA512_SUFFIX:=$(CRYPTO_GENERIC) +AEAD_CONF:=AEAD +MANAGER_CONF:=MANAGER +BLKCIPHER_CONF:=BLKCIPHER +HASH_CONF:=HASH +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1) + CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress + AEAD_CONF:=AEAD2 + MANAGER_CONF:=MANAGER2 + BLKCIPHER_CONF:=BLKCIPHER2 + HASH_CONF:=HASH2 endif +CRYPTO_MODULES = \ + ALGAPI=crypto_algapi \ + $(AEAD_CONF)=aead \ + $(CRYPTO_MODULE_PCOMPRESS) \ + $(BLKCIPHER_CONF)=$(BLKCIPHER_PREFIX)blkcipher \ + $(HASH_CONF)=crypto_hash \ + $(MANAGER_CONF)=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))).$(LINUX_KMOD_SUFFIX)) +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/$(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 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 @@ -77,6 +68,7 @@ define KernelPackage/crypto-hw-padlock 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 @@ -94,6 +86,7 @@ define KernelPackage/crypto-hw-geode 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) @@ -105,8 +98,9 @@ $(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 + DEPENDS:=+kmod-crypto-core +kmod-crypto-des @!TARGET_ubicom32 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) @@ -120,9 +114,10 @@ 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-aead \ - +kmod-crypto-authenc - KCONFIG:= CONFIG_CRYPTO_DEV_IXP4XX + @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_IXP4XX FILES:=$(LINUX_DIR)/drivers/crypto/ixp4xx_crypto.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,ixp4xx_crypto) endef @@ -134,17 +129,35 @@ endef $(eval $(call KernelPackage,crypto-hw-ixp4xx)) +define KernelPackage/crypto-hw-ppc4xx + SUBMENU:=$(CRYPTO_MENU) + TITLE:=AMCC PPC4xx hardware crypto module + DEPENDS:= \ + @TARGET_ppc40x||TARGET_ppc44x +kmod-crypto-core + KCONFIG:= \ + CONFIG_CRYPTO_HW=y \ + CONFIG_CRYPTO_DEV_PPC4XX + FILES:=$(LINUX_DIR)/drivers/crypto/amcc/crypto4xx.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,crypto4xx) +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 SUBMENU:=$(CRYPTO_MENU) TITLE:=AES cipher CryptoAPI module DEPENDS:=+kmod-crypto-core - KCONFIG:=CONFIG_CRYPTO_AES + KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 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$(AES_SUFFIX) aes-i586) endef @@ -164,21 +177,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)