X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e9861a31a402b1555cee95899f2a09ce8a37a6ee..7557428c93299d9428ef49f250c7736b585b0474:/package/kernel/modules/crypto.mk

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index f675c5aac..ef6272680 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
 
@@ -29,16 +28,19 @@ endif
 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1)
   SHA512_SUFFIX:=$(CRYPTO_GENERIC)
 endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1)
+  CRYPTO_MODULE_PCOMPRESS:=PCOMP=pcompress
+endif
 
 CRYPTO_MODULES = \
 	ALGAPI=crypto_algapi \
 	AEAD=aead \
+	$(CRYPTO_MODULE_PCOMPRESS) \
 	BLKCIPHER=$(BLKCIPHER_PREFIX)blkcipher \
-	MANAGER=cryptomgr \
 	HASH=crypto_hash \
+	MANAGER=cryptomgr \
 	CBC=cbc \
 	ECB=ecb \
-	HMAC=hmac \
 	DEFLATE=deflate
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
@@ -50,7 +52,7 @@ crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subs
 define KernelPackage/crypto-core
   SUBMENU:=$(CRYPTO_MENU)
   TITLE:=Core CryptoAPI modules
-  KCONFIG:=CONFIG_CRYPTO=y $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
+  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
@@ -115,7 +117,9 @@ define KernelPackage/crypto-hw-ixp4xx
   TITLE:=Intel IXP4xx hardware crypto module
   DEPENDS:= \
 	@TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +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