diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:21:11 -0800 |
| commit | baa6707381285e68cc472efba58e7e736057aacc (patch) | |
| tree | a5687bdc023a250ce089355d3032043708da8807 /include | |
| parent | 215240462a9672db771bb60adcc1c4fdf40e8ec4 (diff) | |
| parent | 8094c3ceb21ad93896fd4d238e8ba41911932eaf (diff) | |
| download | linux-stable-baa6707381285e68cc472efba58e7e736057aacc.tar.gz linux-stable-baa6707381285e68cc472efba58e7e736057aacc.tar.bz2 linux-stable-baa6707381285e68cc472efba58e7e736057aacc.zip | |
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o:
"Add Adiantum support for fscrypt"
* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: add Adiantum support
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/fs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 53a22e8e0408..121e82ce296b 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -223,7 +223,8 @@ struct fsxattr { #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 +#define FS_POLICY_FLAG_DIRECT_KEY 0x04 /* use master key directly */ +#define FS_POLICY_FLAGS_VALID 0x07 /* Encryption algorithms */ #define FS_ENCRYPTION_MODE_INVALID 0 @@ -235,6 +236,7 @@ struct fsxattr { #define FS_ENCRYPTION_MODE_AES_128_CTS 6 #define FS_ENCRYPTION_MODE_SPECK128_256_XTS 7 /* Removed, do not use. */ #define FS_ENCRYPTION_MODE_SPECK128_256_CTS 8 /* Removed, do not use. */ +#define FS_ENCRYPTION_MODE_ADIANTUM 9 struct fscrypt_policy { __u8 version; |