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

Commit c9602275 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680,... 

Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2

Change-Id: Ia75958a7ea990a00967dbc876fcd5fdd0339fb85
parents 0fac9018 d8e76e1e

fs_mgr/fs_mgr_fstab.cpp

+1 −5
Original line number Diff line number Diff line
@@ -114,12 +114,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},
@@ -128,7 +125,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},

};