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

Merge "fs_mgr_fstab: Add Adiantum support"

Browse source 
am: bb81135fda

Change-Id: Ic5f90dbd5301e46a2f96d706f21f51e7ba5951dc
This commit is contained in:
Greg Kaiser 2018-12-11 21:15:15 -08:00 • committed by android-build-merger
commit 27740d4d3e
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_fstab.cpp
View file

@ -120,9 +120,11 @@ 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_ADIANTUM 5
static const struct flag_list file_contents_encryption_modes[] = {
{"aes-256-xts", EM_AES_256_XTS},
{"adiantum", EM_ADIANTUM},
{"software", EM_AES_256_XTS}, /* alias for backwards compatibility */
{"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */
{0, 0},
@ -131,6 +133,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},
{"adiantum", EM_ADIANTUM},
{0, 0},
};
@ -271,6 +274,8 @@ static int parse_flags(char *flags, struct flag_list *fl,
flag_vals->file_names_mode =
encryption_mode_to_flag(file_names_encryption_modes,
colon + 1, "file names");
} else if (flag_vals->file_contents_mode == EM_ADIANTUM) {
flag_vals->file_names_mode = EM_ADIANTUM;
} else {
flag_vals->file_names_mode = EM_AES_256_CTS;
}