Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 076c36fc authored by Alistair Strachan's avatar Alistair Strachan
Browse files

Revert "fscrypt: add Speck128/256 support" 



This reverts commit eb13e0b6.

Resolves conflicts with a later CL, e7724207 "fscrypt: log the
crypto algorithm implementations".

Also leaves the include/uapi/linux/fs.h constants in place to prevent
future accidental re-use.

Bug: 116008047
Change-Id: I2d64d8d3e384400b7bdfc06a353c3844d4ebb377
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
parent c82807c7

Documentation/filesystems/fscrypt.rst

deleted100644 → 0
+0 −626

File deleted.

Preview size limit exceeded, changes collapsed.

fs/crypto/fscrypt_private.h

+0 −4
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ static inline bool fscrypt_valid_enc_modes(u32 contents_mode, 
	    filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS)

		return true;



	if (contents_mode == FS_ENCRYPTION_MODE_SPECK128_256_XTS &&

	    filenames_mode == FS_ENCRYPTION_MODE_SPECK128_256_CTS)

		return true;



	return false;

}

fs/crypto/keyinfo.c

+1 −10
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static struct fscrypt_mode { 
	int keysize;

	bool logged_impl_name;

} available_modes[] = {

<<<<<<< HEAD

	[FS_ENCRYPTION_MODE_AES_256_XTS] = {

		.friendly_name = "AES-256-XTS",

		.cipher_str = "xts(aes)",
@@ -173,16 +174,6 @@ static struct fscrypt_mode { 
		.cipher_str = "cts(cbc(aes))",

		.keysize = 16,

	},

	[FS_ENCRYPTION_MODE_SPECK128_256_XTS] = {

		.friendly_name = "Speck128/256-XTS",

		.cipher_str = "xts(speck128)",

		.keysize = 64,

	},

	[FS_ENCRYPTION_MODE_SPECK128_256_CTS] = {

		.friendly_name = "Speck128/256-CTS-CBC",

		.cipher_str = "cts(cbc(speck128))",

		.keysize = 32,

	},

};



static struct fscrypt_mode *