summaryrefslogtreecommitdiffstats
path: root/security/keys/encrypted-keys/Makefile
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2011-08-28 04:21:26 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2011-09-14 21:23:49 +0200
commit982e617a313b57abee3bcfa53381c356d00fd64a (patch)
treeba23ab206aaff2331bca116cebd11ad4ef580c32 /security/keys/encrypted-keys/Makefile
parentencrypted-keys: create encrypted-keys directory (diff)
downloadlinux-982e617a313b57abee3bcfa53381c356d00fd64a.tar.xz
linux-982e617a313b57abee3bcfa53381c356d00fd64a.zip
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/keys/encrypted-keys/Makefile')
-rw-r--r--security/keys/encrypted-keys/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile
index cbd3f8de37bb..6bc7a86d1027 100644
--- a/security/keys/encrypted-keys/Makefile
+++ b/security/keys/encrypted-keys/Makefile
@@ -3,3 +3,4 @@
#
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o
+obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.o