diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-05 19:44:58 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-01-12 04:06:18 +0100 |
| commit | bb8179e5a8509876415c0eac6f6ba8a130b3cb47 (patch) | |
| tree | 6889d1baa5a6ed7471f5e17ba549889dbeebcc3a /fs | |
| parent | fscrypt: move fscrypt_operations declaration to fscrypt_supp.h (diff) | |
| download | linux-bb8179e5a8509876415c0eac6f6ba8a130b3cb47.tar.xz linux-bb8179e5a8509876415c0eac6f6ba8a130b3cb47.zip | |
fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.h
The encryption modes are validated by fs/crypto/, not by individual
filesystems. Therefore, move fscrypt_valid_enc_modes() from fscrypt.h
to fscrypt_private.h.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/crypto/fscrypt_private.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h index 823c43a00bf7..2b848e7c92f0 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -71,6 +71,20 @@ typedef enum { #define FS_CTX_REQUIRES_FREE_ENCRYPT_FL 0x00000001 #define FS_CTX_HAS_BOUNCE_BUFFER_FL 0x00000002 +static inline bool fscrypt_valid_enc_modes(u32 contents_mode, + u32 filenames_mode) +{ + if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC && + filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS) + return true; + + if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && + filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) + return true; + + return false; +} + /* crypto.c */ extern struct kmem_cache *fscrypt_info_cachep; extern int fscrypt_initialize(unsigned int cop_flags); |