Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0c1709 authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

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: default avatarMimi Zohar <zohar@us.ibm.com>
Reported-by: default avatarJean-Christophe Dubois <jcd@tribudubois.net>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Tested-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 7f2ab000

security/integrity/ima/Kconfig

+2 −3
Original line number Original line Diff line number Diff line
@@ -2,15 +2,14 @@ 
#

#

config IMA

config IMA

	bool "Integrity Measurement Architecture(IMA)"

	bool "Integrity Measurement Architecture(IMA)"

	depends on ACPI

	depends on SECURITY

	depends on SECURITY

	select SECURITYFS

	select SECURITYFS

	select CRYPTO

	select CRYPTO

	select CRYPTO_HMAC

	select CRYPTO_HMAC

	select CRYPTO_MD5

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select CRYPTO_SHA1

	select TCG_TPM

	select TCG_TPM if !S390

	select TCG_TIS

	select TCG_TIS if TCG_TPM

	help

	help

	  The Trusted Computing Group(TCG) runtime Integrity

	  The Trusted Computing Group(TCG) runtime Integrity

	  Measurement Architecture(IMA) maintains a list of hash

	  Measurement Architecture(IMA) maintains a list of hash