X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5ffeef3276aba056fbaf5a51669c9cf817b81056..7af86956a9634ee676f3941c999b5e02014b178b:/package/kernel/modules/crypto.mk diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index af268088d..879fa969f 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,38 @@ 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) +ifneq ($(CONFIG_LINUX_2_6),) 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) endif +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))).$(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 @@ -72,10 +56,15 @@ endef $(eval $(call KernelPackage,crypto-core)) -define KernelPackage/crypto-hw-padlock +define KernelPackage/crypto/Depends SUBMENU:=$(CRYPTO_MENU) + DEPENDS:=kmod-crypto-core $(1) +endef + + +define KernelPackage/crypto-hw-padlock +$(call KernelPackage/crypto/Depends,) TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PADLOCK \ @@ -91,9 +80,8 @@ $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=AMD Geode hardware crypto module - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE @@ -105,9 +93,8 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,+kmod-crypto-des @!TARGET_ubicom32) TITLE:=HIFN 795x crypto accelerator - DEPENDS:=+kmod-crypto-core +kmod-crypto-des KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ @@ -120,12 +107,11 @@ $(eval $(call KernelPackage,crypto-hw-hifn-795x)) define KernelPackage/crypto-hw-ixp4xx - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,@TARGET_ixp4xx +kmod-crypto-des +kmod-crypto-authenc) 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 + 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 @@ -137,17 +123,32 @@ endef $(eval $(call KernelPackage,crypto-hw-ixp4xx)) +define KernelPackage/crypto-hw-ppc4xx +$(call KernelPackage/crypto/Depends,@TARGET_ppc40x||TARGET_ppc44x) + TITLE:=AMCC PPC4xx hardware crypto module + 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) +$(call KernelPackage/crypto/Depends,) 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 @@ -156,9 +157,8 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=ARC4 (RC4) cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_ARC4 FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,arc4) @@ -167,21 +167,9 @@ 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) +$(call KernelPackage/crypto/Depends,) 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) AUTOLOAD:=$(call AutoLoad,09,authenc) @@ -190,9 +178,8 @@ endef $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=DES/3DES cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_DES FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) @@ -202,9 +189,8 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=HMAC digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_HMAC FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,hmac) @@ -214,9 +200,8 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=MD5 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_MD5 FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,md5) @@ -226,9 +211,8 @@ $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) 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) AUTOLOAD:=$(call AutoLoad,09,michael_mic) @@ -238,9 +222,8 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=SHA1 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_SHA1 FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) @@ -250,9 +233,8 @@ $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-misc - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Other CryptoAPI modules - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_ANUBIS \ CONFIG_CRYPTO_BLOWFISH \ @@ -296,10 +278,10 @@ endef $(eval $(call KernelPackage,crypto-misc)) + define KernelPackage/crypto-ocf - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,@!TARGET_uml +@OPENSSL_ENGINE) TITLE:=OCF modules - DEPENDS:=+kmod-crypto-core @!TARGET_uml KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -321,9 +303,8 @@ $(eval $(call KernelPackage,crypto-ocf)) define KernelPackage/crypto-null - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Null CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_NULL FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,crypto_null) @@ -333,9 +314,8 @@ $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Test CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_TEST FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) endef