crypto: add an option to disable cryptoalgos' self-tests
in [Kernel]
|
Prev: [patch v2] fcntl: return -EFAULT if copy_to_user fails
Next: staging RT2870 removed /etc/Wireless/... configuration files
From: Herbert Xu on 3 Jun 2010 06:40 On Wed, May 26, 2010 at 12:28:34PM +0300, Alexander Shishkin wrote: > By default, CONFIG_CRYPTO_MANAGER_TESTS will be enabled and thus > self-tests will still run, but it is now possible to disable them > to gain some time during bootup. While reviewing this patch I found a bug in the current PCOMP Kconfig entry. commit bc94e59662c13516d13e117b6edab4bec487d5a0 Author: Herbert Xu <herbert(a)gondor.apana.org.au> Date: Thu Jun 3 20:33:06 2010 +1000 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: Herbert Xu <herbert(a)gondor.apana.org.au> diff --git a/crypto/Kconfig b/crypto/Kconfig index 9d9434f..11d0f21 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -80,6 +80,11 @@ config CRYPTO_RNG2 config CRYPTO_PCOMP tristate + select CRYPTO_PCOMP2 + select CRYPTO_ALGAPI + +config CRYPTO_PCOMP2 + tristate select CRYPTO_ALGAPI2 config CRYPTO_MANAGER @@ -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)" diff --git a/crypto/Makefile b/crypto/Makefile index d7e6441..d1cfa05 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -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 Cheers, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Herbert Xu on 3 Jun 2010 07:00
On Wed, May 26, 2010 at 12:28:34PM +0300, Alexander Shishkin wrote: > By default, CONFIG_CRYPTO_MANAGER_TESTS will be enabled and thus > self-tests will still run, but it is now possible to disable them > to gain some time during bootup. > > Signed-off-by: Alexander Shishkin <virtuoso(a)slind.org> > CC: Herbert Xu <herbert(a)gondor.apana.org.au> > CC: linux-kernel(a)vger.kernel.org > CC: linux-crypto(a)vger.kernel.org Patch applied. Thanks a lot! -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <herbert(a)gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |