diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-05-02 14:27:00 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2017-06-21 14:37:12 -0400 |
| commit | 38d192684e8b1811c352c208447d565f8f0a309f (patch) | |
| tree | e374b2dbde5e8e895b6e65deaf55808495534cd6 | |
| parent | 6f6723e21589f4594bb72b27ddbb2f75defb33bb (diff) | |
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>
| -rw-r--r-- | security/integrity/ima/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 8b688a26033d..35ef69312811 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig | |||
| @@ -96,19 +96,19 @@ choice | |||
| 96 | 96 | ||
| 97 | config IMA_DEFAULT_HASH_SHA1 | 97 | config IMA_DEFAULT_HASH_SHA1 |
| 98 | bool "SHA1 (default)" | 98 | bool "SHA1 (default)" |
| 99 | depends on CRYPTO_SHA1 | 99 | depends on CRYPTO_SHA1=y |
| 100 | 100 | ||
| 101 | config IMA_DEFAULT_HASH_SHA256 | 101 | config IMA_DEFAULT_HASH_SHA256 |
| 102 | bool "SHA256" | 102 | bool "SHA256" |
| 103 | depends on CRYPTO_SHA256 && !IMA_TEMPLATE | 103 | depends on CRYPTO_SHA256=y && !IMA_TEMPLATE |
| 104 | 104 | ||
| 105 | config IMA_DEFAULT_HASH_SHA512 | 105 | config IMA_DEFAULT_HASH_SHA512 |
| 106 | bool "SHA512" | 106 | bool "SHA512" |
| 107 | depends on CRYPTO_SHA512 && !IMA_TEMPLATE | 107 | depends on CRYPTO_SHA512=y && !IMA_TEMPLATE |
| 108 | 108 | ||
| 109 | config IMA_DEFAULT_HASH_WP512 | 109 | config IMA_DEFAULT_HASH_WP512 |
| 110 | bool "WP512" | 110 | bool "WP512" |
| 111 | depends on CRYPTO_WP512 && !IMA_TEMPLATE | 111 | depends on CRYPTO_WP512=y && !IMA_TEMPLATE |
| 112 | endchoice | 112 | endchoice |
| 113 | 113 | ||
| 114 | config IMA_DEFAULT_HASH | 114 | config IMA_DEFAULT_HASH |