Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12275 sec: introduce null algo for filename encryption
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
crypto
/
llcrypt_private.h
diff --git
a/libcfs/libcfs/crypto/llcrypt_private.h
b/libcfs/libcfs/crypto/llcrypt_private.h
index
fbf7c73
..
06eafaf
100644
(file)
--- a/
libcfs/libcfs/crypto/llcrypt_private.h
+++ b/
libcfs/libcfs/crypto/llcrypt_private.h
@@
-227,15
+227,18
@@
static inline bool llcrypt_valid_enc_modes(u32 contents_mode,
u32 filenames_mode)
{
if (contents_mode == LLCRYPT_MODE_AES_128_CBC &&
u32 filenames_mode)
{
if (contents_mode == LLCRYPT_MODE_AES_128_CBC &&
- filenames_mode == LLCRYPT_MODE_AES_128_CTS)
+ (filenames_mode == LLCRYPT_MODE_AES_128_CTS ||
+ filenames_mode == LLCRYPT_MODE_NULL))
return true;
if (contents_mode == LLCRYPT_MODE_AES_256_XTS &&
return true;
if (contents_mode == LLCRYPT_MODE_AES_256_XTS &&
- filenames_mode == LLCRYPT_MODE_AES_256_CTS)
+ (filenames_mode == LLCRYPT_MODE_AES_256_CTS ||
+ filenames_mode == LLCRYPT_MODE_NULL))
return true;
if (contents_mode == LLCRYPT_MODE_ADIANTUM &&
return true;
if (contents_mode == LLCRYPT_MODE_ADIANTUM &&
- filenames_mode == LLCRYPT_MODE_ADIANTUM)
+ (filenames_mode == LLCRYPT_MODE_ADIANTUM ||
+ filenames_mode == LLCRYPT_MODE_NULL))
return true;
return false;
return true;
return false;