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

Commit d8e76e1e authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-team Robot
Browse files

Revert "Support Speck encryption." 

This reverts commit 49c27c5c.

Remove the Speck encryption support. It was eventually
decided not to allow Speck in Android P, so this code
is no longer needed and wasn't used outside of testing.

Bug: 112009351
Test: Confirmed AES continues to work with FBE.
Change-Id: Ia5458143be5687fff8d541d8fa2c8ee24a369da4
(cherry picked from commit 270e90f0)
parent 0fac9018

fs_mgr/fs_mgr_fstab.cpp

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

#define EM_ICE          2

#define EM_AES_256_CTS  3

#define EM_AES_256_CTS  3

#define EM_AES_256_HEH  4

#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[] = {

static const struct flag_list file_contents_encryption_modes[] = {

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

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

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

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

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

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

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

    {0, 0},

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

static const struct flag_list file_names_encryption_modes[] = {

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

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

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

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

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

    {0, 0},

    {0, 0},

};

};