crypto: fips - FIPS requires algorithm self-tests

[deliverable/linux.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9d9434f08c92278293838c266f7b5108b3414bd2..866a1d751aa45492c17ad2e1a7fd0f5c9d4fde1e 100644 (file)
--- 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
@@ -79,6 +78,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 +98,15 @@ config CRYPTO_MANAGER2
        select CRYPTO_AEAD2
        select CRYPTO_HASH2
        select CRYPTO_BLKCIPHER2
-       select CRYPTO_PCOMP
+       select CRYPTO_PCOMP2
+
+config CRYPTO_MANAGER_DISABLE_TESTS
+       bool "Disable run-time self tests"
+       default y
+       depends on CRYPTO_MANAGER2
+       help
+         Disable run-time self tests that normally take place at
+         algorithm registration.
 
 config CRYPTO_GF128MUL
        tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"