X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fcrypto.mk;h=d8242952b9485c317d2f4e0ff90b75ed6959d278;hb=45d141ce0e40570733ef068210251ccea91d91a2;hp=5f542d11b31a65f84f024ff61d41c37d0c2a347b;hpb=288c6f063a6d275e94841df7a98d0e62da305364;p=openwrt.git diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 5f542d11b3..d8242952b9 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -18,8 +18,6 @@ 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 @@ -29,21 +27,21 @@ define KernelPackage/crypto-core CONFIG_CRYPTO_ALGAPI \ $(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)))) + AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod))),1) endef $(eval $(call KernelPackage,crypto-core)) define AddDepends/crypto SUBMENU:=$(CRYPTO_MENU) - DEPENDS+=kmod-crypto-core $(1) + DEPENDS+=+kmod-crypto-core $(1) endef define KernelPackage/crypto-hash TITLE:=CryptoAPI hash support KCONFIG:=CONFIG_CRYPTO_HASH2 FILES:=$(LINUX_DIR)/crypto/crypto_hash.ko - AUTOLOAD:=$(call AutoLoad,02,crypto_hash) + AUTOLOAD:=$(call AutoLoad,02,crypto_hash,1) $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-hash)) @@ -62,9 +60,20 @@ define KernelPackage/crypto-manager endef $(eval $(call KernelPackage,crypto-manager)) +define KernelPackage/crypto-pcompress + TITLE:=CryptoAPI Partial (de)compression operations + KCONFIG:= \ + CONFIG_CRYPTO_PCOMP=y \ + CONFIG_CRYPTO_PCOMP2 + FILES:=$(LINUX_DIR)/crypto/pcompress.ko + AUTOLOAD:=$(call AutoLoad,09,pcompress) + $(call AddDepends/crypto) +endef +$(eval $(call KernelPackage,crypto-pcompress)) + define KernelPackage/crypto-user TITLE:=CryptoAPI userspace interface - DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0 + DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager KCONFIG:= \ CONFIG_CRYPTO_USER_API \ CONFIG_CRYPTO_USER_API_HASH \ @@ -141,7 +150,6 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x TITLE:=HIFN 795x crypto accelerator - DEPENDS:=@!TARGET_ubicom32 KCONFIG:= \ CONFIG_HW_RANDOM=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ @@ -154,23 +162,6 @@ 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_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 @@ -209,7 +200,7 @@ define KernelPackage/crypto-arc4 KCONFIG:=CONFIG_CRYPTO_ARC4 FILES:=$(LINUX_DIR)/crypto/arc4.ko AUTOLOAD:=$(call AutoLoad,09,arc4) - $(call AddDepends/crypto) + $(call AddDepends/crypto,+!LINUX_3_3:kmod-crypto-manager) endef $(eval $(call KernelPackage,crypto-arc4)) @@ -341,6 +332,9 @@ endef $(eval $(call KernelPackage,crypto-sha1)) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) +camellia_mod_suffix=_generic +endif define KernelPackage/crypto-misc TITLE:=Other CryptoAPI modules @@ -364,24 +358,22 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_WP512 FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ - $(LINUX_DIR)/crypto/blowfish.ko \ - $(LINUX_DIR)/crypto/camellia.ko \ + $(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \ $(LINUX_DIR)/crypto/cast5.ko \ $(LINUX_DIR)/crypto/cast6.ko \ $(LINUX_DIR)/crypto/fcrypt.ko \ $(LINUX_DIR)/crypto/khazad.ko \ - $(LINUX_DIR)/crypto/serpent.ko \ $(LINUX_DIR)/crypto/sha256_generic.ko \ $(LINUX_DIR)/crypto/sha512_generic.ko \ $(LINUX_DIR)/crypto/tea.ko \ $(LINUX_DIR)/crypto/tgr192.ko \ $(LINUX_DIR)/crypto/twofish_common.ko \ - $(LINUX_DIR)/crypto/wp512.ko - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,2.6.35)),1) - FILES += $(LINUX_DIR)/crypto/twofish.ko - else - FILES += $(LINUX_DIR)/crypto/twofish_generic.ko - endif + $(LINUX_DIR)/crypto/wp512.ko \ + $(LINUX_DIR)/crypto/twofish_generic.ko + FILES += \ + $(LINUX_DIR)/crypto/blowfish_common.ko \ + $(LINUX_DIR)/crypto/blowfish_generic.ko \ + $(LINUX_DIR)/crypto/serpent_generic.ko $(call AddDepends/crypto) endef @@ -395,7 +387,7 @@ $(eval $(call KernelPackage,crypto-misc)) define KernelPackage/crypto-ocf TITLE:=OCF modules - DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager + DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @!TARGET_uml +kmod-crypto-manager KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -419,7 +411,7 @@ $(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 + DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf KCONFIG:=CONFIG_OCF_HIFN FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifn7751.ko AUTOLOAD:=$(call AutoLoad,10,hifn7751) @@ -431,7 +423,7 @@ $(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 + DEPENDS:=+@OPENSSL_ENGINE_CRYPTO @PCI_SUPPORT @!TARGET_uml kmod-crypto-ocf KCONFIG:=CONFIG_OCF_HIFNHIPP FILES:=$(LINUX_DIR)/crypto/ocf/hifn/hifnHIPP.ko AUTOLOAD:=$(call AutoLoad,10,hifnHIPP) @@ -490,19 +482,3 @@ define KernelPackage/crypto-mv-cesa endef $(eval $(call KernelPackage,crypto-mv-cesa)) - - -define KernelPackage/ocf-ubsec-ssb - TITLE:=BCM5365P IPSec Core driver - DEPENDS:=@TARGET_brcm47xx +kmod-crypto-ocf - KCONFIG:=CONFIG_OCF_UBSEC_SSB - FILES:=$(LINUX_DIR)/crypto/ocf/ubsec_ssb/ubsec_ssb.ko - AUTOLOAD:=$(call AutoLoad,10,ubsec_ssb) - $(call AddDepends/crypto) -endef - -define KernelPackage/ocf-ubsec-ssb/description - This package contains the OCF driver for the BCM5365p IPSec Core -endef - -$(eval $(call KernelPackage,ocf-ubsec-ssb))