From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Wed, 17 Aug 2011 22:51:36 +0000 (-0400)
Subject: evm: add Kconfig TCG_TPM dependency
X-Git-Tag: v3.2-rc1~190^2~56
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=dbe5ad17ec62fbd3be7789f9a5ab71d23da8acf0

evm: add Kconfig TCG_TPM dependency

Although the EVM encrypted-key should be encrypted/decrypted using a
trusted-key, a user-defined key could be used instead. When using a user-
defined key, a TCG_TPM dependency should not be required.  Unfortunately,
the encrypted-key code needs to be refactored a bit in order to remove
this dependency.

This patch adds the TCG_TPM dependency.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>,
	     Randy Dunlap <rdunlap@xenotimenet>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig
index 444877d9239b..884617d4aad0 100644
--- a/security/integrity/evm/Kconfig
+++ b/security/integrity/evm/Kconfig
@@ -1,6 +1,6 @@
 config EVM
 	boolean "EVM support"
-	depends on SECURITY && KEYS
+	depends on SECURITY && KEYS && TCG_TPM
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1