This patch set adds support for the 'encrypted' key type in the eCryptfs filesystem. Changelog from version v2: - rebased on the latest commit of the mainline kernel (d315777b32a); - added two new functions ecryptfs_get_encrypted_key_payload_data() and ecryptfs_get_encrypted_key() in the file fs/ecryptfs/ecryptfs_kernel.h. Roberto Sassu Roberto Sassu (6): encrypted-keys: fixed valid_master_desc() function description encrypted-keys: added additional debug messages encrypted-keys: add key format support eCryptfs: export global eCryptfs definitions to include/linux/ecryptfs.h encrypted-keys: add ecryptfs format support eCryptfs: added support for the encrypted key type Documentation/keys-ecryptfs.txt | 68 +++++++++ Documentation/keys-trusted-encrypted.txt | 52 ++++--- fs/ecryptfs/ecryptfs_kernel.h | 150 +++++-------------- fs/ecryptfs/keystore.c | 11 +- include/keys/encrypted-type.h | 13 ++- include/linux/ecryptfs.h | 113 ++++++++++++++ security/keys/Makefile | 2 +- security/keys/encrypted.c | 242 ++++++++++++++++++++++++------ security/keys/keys_ecryptfs.c | 81 ++++++++++ security/keys/keys_ecryptfs.h | 30 ++++ 10 files changed, 577 insertions(+), 185 deletions(-) create mode 100644 Documentation/keys-ecryptfs.txt create mode 100644 include/linux/ecryptfs.h create mode 100644 security/keys/keys_ecryptfs.c create mode 100644 security/keys/keys_ecryptfs.h -- 1.7.3.4