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

Commit 1df4cee2 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

Merge "Support Speck encryption." 

am: 14da8f60

Change-Id: I3914b1d09fbb3ba234b0f56488e5aacd622280b0
parents 1cf05129 14da8f60

fs_mgr/fs_mgr_fstab.cpp

+5 −1
Original line number Diff line number Diff line
@@ -116,9 +116,12 @@ 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},
@@ -127,6 +130,7 @@ 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},

};