From: Ben Hutchings Date: Tue, 2 May 2017 18:27:00 +0000 (+0100) Subject: IMA: Correct Kconfig dependencies for hash selection X-Git-Tag: v4.13-rc1~161^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38d192684e8b1811c352c208447d565f8f0a309f;p=thirdparty%2Flinux.git 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 Signed-off-by: Mimi Zohar --- diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 8b688a26033d8..35ef693128113 100644 --- 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