diff options
| author | Roberto Sassu <roberto.sassu@polito.it> | 2011-06-27 13:45:44 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-06-27 09:11:17 -0400 |
| commit | 79a73d188726b473ca3bf483244bc96096831905 (patch) | |
| tree | 787ba050c91981cae2524b1e95e415424b067e64 /security/keys/Makefile | |
| parent | f8f8527103a264b5e4ab2ce5c1743b28f3219d90 (diff) | |
| download | linux-79a73d188726b473ca3bf483244bc96096831905.tar.gz linux-79a73d188726b473ca3bf483244bc96096831905.tar.bz2 linux-79a73d188726b473ca3bf483244bc96096831905.zip | |
encrypted-keys: add ecryptfs format support
The 'encrypted' key type defines its own payload format which contains a
symmetric key randomly generated that cannot be used directly to mount
an eCryptfs filesystem, because it expects an authentication token
structure.
This patch introduces the new format 'ecryptfs' that allows to store an
authentication token structure inside the encrypted key payload containing
a randomly generated symmetric key, as the same for the format 'default'.
More details about the usage of encrypted keys with the eCryptfs
filesystem can be found in the file 'Documentation/keys-ecryptfs.txt'.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Acked-by: Gianluca Ramunno <ramunno@polito.it>
Acked-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/keys/Makefile')
| -rw-r--r-- | security/keys/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index 1bf090a885fe..b34cc6ee6900 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile @@ -14,7 +14,7 @@ obj-y := \ user_defined.o obj-$(CONFIG_TRUSTED_KEYS) += trusted.o -obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o +obj-$(CONFIG_ENCRYPTED_KEYS) += ecryptfs_format.o encrypted.o obj-$(CONFIG_KEYS_COMPAT) += compat.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSCTL) += sysctl.o |