diff options
| author | Theodore Ts'o | 2016-12-13 03:50:28 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2016-12-13 03:50:28 +0100 |
| commit | a551d7c8deefb6d9fb45a1de03a617dd064e0419 (patch) | |
| tree | c58f83ef3edd83d55f8f574cfe7ba023e029090b /include/uapi/linux/fs.h | |
| parent | dax: Fix sleep in atomic contex in grab_mapping_entry() (diff) | |
| parent | fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL (diff) | |
| download | kernel-qcow2-linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.tar.gz kernel-qcow2-linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.tar.xz kernel-qcow2-linux-a551d7c8deefb6d9fb45a1de03a617dd064e0419.zip | |
Merge branch 'fscrypt' into dev
Diffstat (limited to 'include/uapi/linux/fs.h')
| -rw-r--r-- | include/uapi/linux/fs.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index acb2b6152ba0..0496d37abe28 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -254,6 +254,20 @@ struct fsxattr { /* Policy provided via an ioctl on the topmost directory */ #define FS_KEY_DESCRIPTOR_SIZE 8 +#define FS_POLICY_FLAGS_PAD_4 0x00 +#define FS_POLICY_FLAGS_PAD_8 0x01 +#define FS_POLICY_FLAGS_PAD_16 0x02 +#define FS_POLICY_FLAGS_PAD_32 0x03 +#define FS_POLICY_FLAGS_PAD_MASK 0x03 +#define FS_POLICY_FLAGS_VALID 0x03 + +/* Encryption algorithms */ +#define FS_ENCRYPTION_MODE_INVALID 0 +#define FS_ENCRYPTION_MODE_AES_256_XTS 1 +#define FS_ENCRYPTION_MODE_AES_256_GCM 2 +#define FS_ENCRYPTION_MODE_AES_256_CBC 3 +#define FS_ENCRYPTION_MODE_AES_256_CTS 4 + struct fscrypt_policy { __u8 version; __u8 contents_encryption_mode; |