diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-08-27 22:21:26 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-09-14 15:23:49 -0400 |
commit | 982e617a313b57abee3bcfa53381c356d00fd64a (patch) | |
tree | ba23ab206aaff2331bca116cebd11ad4ef580c32 /security/Kconfig | |
parent | 61cf45d0199041df1a8ba334b6bf4a3a13b7f904 (diff) |
encrypted-keys: remove trusted-keys dependency
Encrypted keys are decrypted/encrypted using either a trusted-key or,
for those systems without a TPM, a user-defined key. This patch
removes the trusted-keys and TCG_TPM dependencies.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/Kconfig')
-rw-r--r-- | security/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig index 22847a889081..51bd5a0b69ae 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
@@ -38,7 +38,9 @@ config TRUSTED_KEYS | |||
38 | 38 | ||
39 | config ENCRYPTED_KEYS | 39 | config ENCRYPTED_KEYS |
40 | tristate "ENCRYPTED KEYS" | 40 | tristate "ENCRYPTED KEYS" |
41 | depends on KEYS && TRUSTED_KEYS | 41 | depends on KEYS |
42 | select CRYPTO | ||
43 | select CRYPTO_HMAC | ||
42 | select CRYPTO_AES | 44 | select CRYPTO_AES |
43 | select CRYPTO_CBC | 45 | select CRYPTO_CBC |
44 | select CRYPTO_SHA256 | 46 | select CRYPTO_SHA256 |