summaryrefslogtreecommitdiff
path: root/Documentation/filesystems/fscrypt.rst
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-04-24 08:22:16 +0200
committerTakashi Iwai <tiwai@suse.de>2020-04-24 08:22:55 +0200
commit36dbae9945322e660795e73ffc8ed8ae4f25d13d (patch)
tree9e444e68380061dccfaa453d1f02cf21c5c986ef /Documentation/filesystems/fscrypt.rst
parent14ff6c5546e7d98f8326d9ee7a75b79de9874efb (diff)
parent0d283287a42027e8a618bcdf17b79578041ebabd (diff)
Merge branch 'topic/nhlt' into for-next
Merge NHLT init cleanup. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/filesystems/fscrypt.rst')
-rw-r--r--Documentation/filesystems/fscrypt.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst
index bd9932344804..aa072112cfff 100644
--- a/Documentation/filesystems/fscrypt.rst
+++ b/Documentation/filesystems/fscrypt.rst
@@ -633,6 +633,17 @@ from a passphrase or other low-entropy user credential.
FS_IOC_GET_ENCRYPTION_PWSALT is deprecated. Instead, prefer to
generate and manage any needed salt(s) in userspace.
+Getting a file's encryption nonce
+---------------------------------
+
+Since Linux v5.7, the ioctl FS_IOC_GET_ENCRYPTION_NONCE is supported.
+On encrypted files and directories it gets the inode's 16-byte nonce.
+On unencrypted files and directories, it fails with ENODATA.
+
+This ioctl can be useful for automated tests which verify that the
+encryption is being done correctly. It is not needed for normal use
+of fscrypt.
+
Adding keys
-----------