diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-05-04 18:16:30 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-05-16 19:21:58 -0400 |
commit | ba0c1709f4946a5ca1a678f4318ed72c0d409b3c (patch) | |
tree | 22c60e909f1dccf1fa6f0c0b51b9e3163d66cfc1 /security/integrity | |
parent | 7f2ab000c6f2ae46070807a3bf645c45d8639460 (diff) |
ima: remove ACPI dependency
The ACPI dependency moved to the TPM, where it belongs. Although
IMA per-se does not require access to the bios measurement log,
verifying the IMA boot aggregate does, which requires ACPI.
This patch prereq's 'TPM: ACPI/PNP dependency removal'
http://lkml.org/lkml/2010/5/4/378.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Reported-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity')
-rw-r--r-- | security/integrity/ima/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 3d7846de8069..b6ecfd4d8d78 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig | |||
@@ -2,15 +2,14 @@ | |||
2 | # | 2 | # |
3 | config IMA | 3 | config IMA |
4 | bool "Integrity Measurement Architecture(IMA)" | 4 | bool "Integrity Measurement Architecture(IMA)" |
5 | depends on ACPI | ||
6 | depends on SECURITY | 5 | depends on SECURITY |
7 | select SECURITYFS | 6 | select SECURITYFS |
8 | select CRYPTO | 7 | select CRYPTO |
9 | select CRYPTO_HMAC | 8 | select CRYPTO_HMAC |
10 | select CRYPTO_MD5 | 9 | select CRYPTO_MD5 |
11 | select CRYPTO_SHA1 | 10 | select CRYPTO_SHA1 |
12 | select TCG_TPM | 11 | select TCG_TPM if !S390 |
13 | select TCG_TIS | 12 | select TCG_TIS if TCG_TPM |
14 | help | 13 | help |
15 | The Trusted Computing Group(TCG) runtime Integrity | 14 | The Trusted Computing Group(TCG) runtime Integrity |
16 | Measurement Architecture(IMA) maintains a list of hash | 15 | Measurement Architecture(IMA) maintains a list of hash |