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

Commit 42149220 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge "Revert "Support Speck encryption."" 

am: 7d4e7d31

Change-Id: I4fbd66f6fa138d8f3910f8bd9ecc5d8e9a106f8d
parents 04d96404 7d4e7d31

fs_mgr/fs_mgr_fstab.cpp

+1 −5
Original line number Diff line number Diff line
@@ -117,12 +117,9 @@ static struct flag_list fs_mgr_flags[] = { 
#define EM_ICE          2

#define EM_AES_256_CTS  3

#define EM_AES_256_HEH  4

#define EM_SPECK_128_256_XTS 5

#define EM_SPECK_128_256_CTS 6



static const struct flag_list file_contents_encryption_modes[] = {

    {"aes-256-xts", EM_AES_256_XTS},

    {"speck128/256-xts", EM_SPECK_128_256_XTS},

    {"software", EM_AES_256_XTS}, /* alias for backwards compatibility */

    {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */

    {0, 0},
@@ -131,7 +128,6 @@ static const struct flag_list file_contents_encryption_modes[] = { 
static const struct flag_list file_names_encryption_modes[] = {

    {"aes-256-cts", EM_AES_256_CTS},

    {"aes-256-heh", EM_AES_256_HEH},

    {"speck128/256-cts", EM_SPECK_128_256_CTS},

    {0, 0},

};