summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2010-05-04 18:16:30 -0400
committerJames Morris <jmorris@namei.org>2010-05-17 09:21:58 +1000
commitba0c1709f4946a5ca1a678f4318ed72c0d409b3c (patch)
tree22c60e909f1dccf1fa6f0c0b51b9e3163d66cfc1 /security
parent7f2ab000c6f2ae46070807a3bf645c45d8639460 (diff)
downloadlinux-stable-ba0c1709f4946a5ca1a678f4318ed72c0d409b3c.tar.gz
linux-stable-ba0c1709f4946a5ca1a678f4318ed72c0d409b3c.tar.bz2
linux-stable-ba0c1709f4946a5ca1a678f4318ed72c0d409b3c.zip
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')
-rw-r--r--security/integrity/ima/Kconfig5
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 @@
#
config IMA
bool "Integrity Measurement Architecture(IMA)"
- depends on ACPI
depends on SECURITY
select SECURITYFS
select CRYPTO
select CRYPTO_HMAC
select CRYPTO_MD5
select CRYPTO_SHA1
- select TCG_TPM
- select TCG_TIS
+ select TCG_TPM if !S390
+ select TCG_TIS if TCG_TPM
help
The Trusted Computing Group(TCG) runtime Integrity
Measurement Architecture(IMA) maintains a list of hash