提交 bc94e596 编写于 作者: H Herbert Xu

crypto: pcomp - Fix illegal Kconfig configuration

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: NHerbert Xu <herbert@gondor.apana.org.au>
上级 749d811f
...@@ -79,6 +79,11 @@ config CRYPTO_RNG2 ...@@ -79,6 +79,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
...@@ -94,7 +99,7 @@ config CRYPTO_MANAGER2 ...@@ -94,7 +99,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)"
......
...@@ -26,7 +26,7 @@ crypto_hash-objs += ahash.o ...@@ -26,7 +26,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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册