aboutsummaryrefslogtreecommitdiff
path: root/security/integrity
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2011-08-17 18:51:36 -0400
committerJames Morris <jmorris@namei.org>2011-08-18 12:58:12 +1000
commitdbe5ad17ec62fbd3be7789f9a5ab71d23da8acf0 (patch)
tree60e4ae2f8b5d66faac484f5774d22290a51c21e4 /security/integrity
parent09f464bf0961aba3cd917d4939597bafb269fb95 (diff)
downloadlinux-linaro-stable-dbe5ad17ec62fbd3be7789f9a5ab71d23da8acf0.tar.gz
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>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/evm/Kconfig2
1 files changed, 1 insertions, 1 deletions
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