Commit 41d5319a authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

fscrypt: move the policy flags and encryption mode definitions to uapi header 



These constants are part of the UAPI, so they belong in
include/uapi/linux/fs.h instead of include/linux/fscrypto.h

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
parent cc4e0df0

include/linux/fscrypto.h

+0 −14
Original line number Diff line number Diff line
@@ -18,20 +18,6 @@ 
#include <crypto/skcipher.h>

#include <uapi/linux/fs.h>



#define FS_POLICY_FLAGS_PAD_4		0x00

#define FS_POLICY_FLAGS_PAD_8		0x01

#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



/* Encryption algorithms */

#define FS_ENCRYPTION_MODE_INVALID		0

#define FS_ENCRYPTION_MODE_AES_256_XTS		1

#define FS_ENCRYPTION_MODE_AES_256_GCM		2

#define FS_ENCRYPTION_MODE_AES_256_CBC		3

#define FS_ENCRYPTION_MODE_AES_256_CTS		4



#define FS_CRYPTO_BLOCK_SIZE		16



struct fscrypt_info;

include/uapi/linux/fs.h

+14 −0
Original line number Diff line number Diff line
@@ -254,6 +254,20 @@ struct fsxattr { 
/* Policy provided via an ioctl on the topmost directory */

#define FS_KEY_DESCRIPTOR_SIZE	8



#define FS_POLICY_FLAGS_PAD_4		0x00

#define FS_POLICY_FLAGS_PAD_8		0x01

#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



/* Encryption algorithms */

#define FS_ENCRYPTION_MODE_INVALID		0

#define FS_ENCRYPTION_MODE_AES_256_XTS		1

#define FS_ENCRYPTION_MODE_AES_256_GCM		2

#define FS_ENCRYPTION_MODE_AES_256_CBC		3

#define FS_ENCRYPTION_MODE_AES_256_CTS		4



struct fscrypt_policy {

	__u8 version;

	__u8 contents_encryption_mode;