aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/security
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2018-12-04 13:31:33 -0500
committerDan Williams <dan.j.williams@intel.com>2018-12-13 20:54:13 -0500
commit9db67581b91d9e9e05c35570ac3f93872e6c84ca (patch)
treeff45815c6b756313755cf3f688cddbecf2cd2fc8 /Documentation/security
parent76ef5e17252789da79db78341851922af0c16181 (diff)
keys-encrypted: add nvdimm key format type to encrypted keys
Adding nvdimm key format type to encrypted keys in order to limit the size of the key to 32bytes. Signed-off-by: Dave Jiang <dave.jiang@intel.com> Acked-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'Documentation/security')
-rw-r--r--Documentation/security/keys/trusted-encrypted.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/security/keys/trusted-encrypted.rst b/Documentation/security/keys/trusted-encrypted.rst
index 3bb24e09a332..e8a1c35cd277 100644
--- a/Documentation/security/keys/trusted-encrypted.rst
+++ b/Documentation/security/keys/trusted-encrypted.rst
@@ -76,7 +76,7 @@ Usage::
76 76
77Where:: 77Where::
78 78
79 format:= 'default | ecryptfs' 79 format:= 'default | ecryptfs | enc32'
80 key-type:= 'trusted' | 'user' 80 key-type:= 'trusted' | 'user'
81 81
82 82
@@ -173,3 +173,7 @@ are anticipated. In particular the new format 'ecryptfs' has been defined in
173in order to use encrypted keys to mount an eCryptfs filesystem. More details 173in order to use encrypted keys to mount an eCryptfs filesystem. More details
174about the usage can be found in the file 174about the usage can be found in the file
175``Documentation/security/keys/ecryptfs.rst``. 175``Documentation/security/keys/ecryptfs.rst``.
176
177Another new format 'enc32' has been defined in order to support encrypted keys
178with payload size of 32 bytes. This will initially be used for nvdimm security
179but may expand to other usages that require 32 bytes payload.