crypto: drbg - Flatten the DRBG menu

Now that the menuconfig CRYPTO_DRBG_MENU has no options in it other than
the hidden symbol CRYPTO_DRBG, remove it and move CRYPTO_DRBG to its
parent menu.  Give CRYPTO_DRBG an appropriate prompt and help text.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 14519474a67bde38d64dde59698e387507a317f5..1abb3d3564582e01db227c1e67b473b1baf2f92d 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1113,24 +1113,17 @@ endmenu
 
 menu "Random number generation"
 
-menuconfig CRYPTO_DRBG_MENU
-       tristate "NIST SP800-90A DRBG (Deterministic Random Bit Generator)"
-       help
-         DRBG (Deterministic Random Bit Generator) (NIST SP800-90A)
-
-         In the following submenu, one or more of the DRBG types must be selected.
-
-if CRYPTO_DRBG_MENU
-
 config CRYPTO_DRBG
-       tristate
-       default CRYPTO_DRBG_MENU
+       tristate "NIST SP800-90A DRBG (Deterministic Random Bit Generator)"
        select CRYPTO_HMAC
        select CRYPTO_JITTERENTROPY
        select CRYPTO_RNG
        select CRYPTO_SHA512
+       help
+         DRBG (Deterministic Random Bit Generator) (NIST SP800-90A)
 
-endif  # if CRYPTO_DRBG_MENU
+         Enable this only if you need it for a FIPS 140 certification.
+         It's otherwise redundant with the kernel's regular RNG.
 
 config CRYPTO_JITTERENTROPY
        tristate "CPU Jitter Non-Deterministic RNG (Random Number Generator)"