IMA: Correct Kconfig dependencies for hash selection

IMA uses the hash algorithm too early to be able to use a module.
Require the selected hash algorithm to be built-in.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 8b688a2..35ef693 100644 (file)
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -96,19 +96,19 @@ choice
 
        config IMA_DEFAULT_HASH_SHA1
                bool "SHA1 (default)"
-               depends on CRYPTO_SHA1
+               depends on CRYPTO_SHA1=y
 
        config IMA_DEFAULT_HASH_SHA256
                bool "SHA256"
-               depends on CRYPTO_SHA256 && !IMA_TEMPLATE
+               depends on CRYPTO_SHA256=y && !IMA_TEMPLATE
 
        config IMA_DEFAULT_HASH_SHA512
                bool "SHA512"
-               depends on CRYPTO_SHA512 && !IMA_TEMPLATE
+               depends on CRYPTO_SHA512=y && !IMA_TEMPLATE
 
        config IMA_DEFAULT_HASH_WP512
                bool "WP512"
-               depends on CRYPTO_WP512 && !IMA_TEMPLATE
+               depends on CRYPTO_WP512=y && !IMA_TEMPLATE
 endchoice
 
 config IMA_DEFAULT_HASH