aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-09-03 07:17:49 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2010-09-03 07:17:49 -0400
commite84c5480b782c4009ef65b0248be7f0864573d7e (patch)
treea85b72e7de8b48b36ddef12d1835e73c708ba6b9 /crypto
parent537559a5b3ef854772bd89fbb43aa77d0bbfb721 (diff)
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 e573077f1672..866a1d751aa4 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -23,13 +23,12 @@ comment "Crypto core or helper"
23 23
24config CRYPTO_FIPS 24config CRYPTO_FIPS
25 bool "FIPS 200 compliance" 25 bool "FIPS 200 compliance"
26 depends on CRYPTO_ANSI_CPRNG 26 depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
27 help 27 help
28 This options enables the fips boot option which is 28 This options enables the fips boot option which is
29 required if you want to system to operate in a FIPS 200 29 required if you want to system to operate in a FIPS 200
30 certification. You should say no unless you know what 30 certification. You should say no unless you know what
31 this is. Note that CRYPTO_ANSI_CPRNG is required if this 31 this is.
32 option is selected
33 32
34config CRYPTO_ALGAPI 33config CRYPTO_ALGAPI
35 tristate 34 tristate