X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Fcrypto%2Fllcrypt_private.h;fp=libcfs%2Flibcfs%2Fcrypto%2Fllcrypt_private.h;h=06eafaf2b80a9bab1f3529581d35ec25b397323c;hp=fbf7c73a233c04a907963a7207cbedf3669e723b;hb=c60b7d9f571748fb055d29cd019709f9e965a84d;hpb=24efa706939752487d8f8c9742400182d513157f;ds=sidebyside

diff --git a/libcfs/libcfs/crypto/llcrypt_private.h b/libcfs/libcfs/crypto/llcrypt_private.h
index fbf7c73..06eafaf 100644
--- 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 &&
-	    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 &&
-	    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 &&
-	    filenames_mode == LLCRYPT_MODE_ADIANTUM)
+	    (filenames_mode == LLCRYPT_MODE_ADIANTUM ||
+	     filenames_mode == LLCRYPT_MODE_NULL))
 		return true;
 
 	return false;