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

Commit 4da9048b authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge PPR2.181005.003 from pi-release-2 into pi-platform-release. 

Change-Id: I398364a59b493057139bdfd5de6b5070978c44bb
BUG: 117431430
parents 0fac9018 c9602275

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},

};