summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-09-03 19:17:49 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-09-03 19:17:49 +0800
commite84c5480b782c4009ef65b0248be7f0864573d7e (patch)
treea85b72e7de8b48b36ddef12d1835e73c708ba6b9 /crypto
parent537559a5b3ef854772bd89fbb43aa77d0bbfb721 (diff)
downloadlinux-3.10-e84c5480b782c4009ef65b0248be7f0864573d7e.tar.gz
linux-3.10-e84c5480b782c4009ef65b0248be7f0864573d7e.tar.bz2
linux-3.10-e84c5480b782c4009ef65b0248be7f0864573d7e.zip
crypto: fips - FIPS requires algorithm self-tests
Signed-off-by: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index e573077f167..866a1d751aa 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -23,13 +23,12 @@ comment "Crypto core or helper"
config CRYPTO_FIPS
bool "FIPS 200 compliance"
- depends on CRYPTO_ANSI_CPRNG
+ depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
help
This options enables the fips boot option which is
required if you want to system to operate in a FIPS 200
certification. You should say no unless you know what
- this is. Note that CRYPTO_ANSI_CPRNG is required if this
- option is selected
+ this is.
config CRYPTO_ALGAPI
tristate