ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support Speck encryption." am: 14da8f607f

Browse source 
am: 1df4cee2d1

Change-Id: I12936d157eac453515e44dba260920be5f414f2e
This commit is contained in:
Paul Crowley 2018-03-30 21:08:48 +00:00 • committed by android-build-merger
commit 0feca7cf7e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr_fstab.cpp
View file

@ -116,17 +116,21 @@ 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 */
{"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */
{0, 0},
};
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},
};