diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-08-17 18:51:36 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-08-17 22:58:12 -0400 |
| commit | dbe5ad17ec62fbd3be7789f9a5ab71d23da8acf0 (patch) | |
| tree | 60e4ae2f8b5d66faac484f5774d22290a51c21e4 | |
| parent | 09f464bf0961aba3cd917d4939597bafb269fb95 (diff) | |
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>
| -rw-r--r-- | security/integrity/evm/Kconfig | 2 |
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 @@ | |||
| 1 | config EVM | 1 | config EVM |
| 2 | boolean "EVM support" | 2 | boolean "EVM support" |
| 3 | depends on SECURITY && KEYS | 3 | depends on SECURITY && KEYS && TCG_TPM |
| 4 | select CRYPTO_HMAC | 4 | select CRYPTO_HMAC |
| 5 | select CRYPTO_MD5 | 5 | select CRYPTO_MD5 |
| 6 | select CRYPTO_SHA1 | 6 | select CRYPTO_SHA1 |