Commit bb8179e5 authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent bdd23476

fs/crypto/fscrypt_private.h

+14 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/fscrypt.h

+0 −14
Original line number Diff line number Diff line
@@ -57,20 +57,6 @@ struct fscrypt_name { 
/* Maximum value for the third parameter of fscrypt_operations.set_context(). */

#define FSCRYPT_SET_CONTEXT_MAX_SIZE	28



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;

}



static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)

{

	if (str->len == 1 && str->name[0] == '.')