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

This project is archived. Its data is read-only.

Commit fd73fe98 authored Oct 22, 2018 by Alistair Strachan

Build fix for 076c36fc.



Bug: 116008047
Change-Id: I053866f49e1ec090fde9a6fbf19a34c5e4e6e8e3
Signed-off-by: Alistair Strachan <astrachan@google.com>

parent ced713fd

fs/crypto/keyinfo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@ 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)",