genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-19 05:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: pcomp - Fix illegal Kconfig configuration

Browse Source 
The PCOMP Kconfig entry current allows the following combination
which is illegal:

ZLIB=y
PCOMP=y
ALGAPI=m
ALGAPI2=y
MANAGER=m
MANAGER2=m

This patch fixes this by adding PCOMP2 so that PCOMP can select
ALGAPI to propagate the setting to MANAGER2.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2010-06-03 20:33:06 +10:00
committed by Matt Sealey
parent 45273d43cc
commit ccaf06fab7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/Kconfig
View File

@@ -77,6 +77,11 @@ config CRYPTO_RNG2
select CRYPTO_ALGAPI2 select CRYPTO_ALGAPI2
config CRYPTO_PCOMP config CRYPTO_PCOMP
tristate
select CRYPTO_PCOMP2
select CRYPTO_ALGAPI
config CRYPTO_PCOMP2
tristate tristate
select CRYPTO_ALGAPI2 select CRYPTO_ALGAPI2
@@ -92,7 +97,7 @@ config CRYPTO_MANAGER2
select CRYPTO_AEAD2 select CRYPTO_AEAD2
select CRYPTO_HASH2 select CRYPTO_HASH2
select CRYPTO_BLKCIPHER2 select CRYPTO_BLKCIPHER2
select CRYPTO_PCOMP select CRYPTO_PCOMP2
config CRYPTO_GF128MUL config CRYPTO_GF128MUL
tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

2
crypto/Makefile
View File

@@ -27,7 +27,7 @@ crypto_hash-objs += ahash.o
crypto_hash-objs += shash.o crypto_hash-objs += shash.o
obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
obj-$(CONFIG_CRYPTO_PCOMP) += pcompress.o obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o
cryptomgr-objs := algboss.o testmgr.o cryptomgr-objs := algboss.o testmgr.o