Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc94e596 authored by Herbert Xu's avatar Herbert Xu
Browse files

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 749d811f

crypto/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ config CRYPTO_RNG2 
	select CRYPTO_ALGAPI2



config CRYPTO_PCOMP

	tristate

	select CRYPTO_PCOMP2

	select CRYPTO_ALGAPI



config CRYPTO_PCOMP2

	tristate

	select CRYPTO_ALGAPI2
@@ -94,7 +99,7 @@ config CRYPTO_MANAGER2 
	select CRYPTO_AEAD2

	select CRYPTO_HASH2

	select CRYPTO_BLKCIPHER2

	select CRYPTO_PCOMP

	select CRYPTO_PCOMP2



config CRYPTO_GF128MUL

	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ crypto_hash-objs += ahash.o 
crypto_hash-objs += shash.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