diff options
| author | James Morris <jmorris@namei.org> | 2011-09-15 09:53:38 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-09-15 09:53:38 +1000 |
| commit | 8de6ac7f58a22fdab399fbe97763e465ea49c735 (patch) | |
| tree | 46104451c69f5270fcc11137aecff012a2ecf612 /security/integrity/evm/Kconfig | |
| parent | 843d183cdd816549b73e6bd3ae07f64adddf714b (diff) | |
| parent | fb788d8b981fa55603873416882f8dcf835e7924 (diff) | |
Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next
Diffstat (limited to 'security/integrity/evm/Kconfig')
| -rw-r--r-- | security/integrity/evm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/integrity/evm/Kconfig b/security/integrity/evm/Kconfig index 884617d4aad..afbb59dd262 100644 --- a/security/integrity/evm/Kconfig +++ b/security/integrity/evm/Kconfig @@ -1,11 +1,10 @@ config EVM boolean "EVM support" - depends on SECURITY && KEYS && TCG_TPM + depends on SECURITY && KEYS && (TRUSTED_KEYS=y || TRUSTED_KEYS=n) select CRYPTO_HMAC select CRYPTO_MD5 select CRYPTO_SHA1 select ENCRYPTED_KEYS - select TRUSTED_KEYS default n help EVM protects a file's security extended attributes against |