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

Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: cb1a8e7fdd

Browse source 
Change-Id: Iad7cbe4ac9b2be29f490e638465cfc28f8214d00
This commit is contained in:
Automerger Merge Worker 2020-02-01 16:19:49 +00:00
commit f6bb9cd7ad
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/fs_mgr_fstab.cpp
View file

@ -277,6 +277,9 @@ void ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
} else if (StartsWith(flag, "keydirectory=")) {
// The metadata flag is followed by an = and the directory for the keys.
entry->metadata_key_dir = arg;
} else if (StartsWith(flag, "metadata_cipher=")) {
// Specify the cipher to use for metadata encryption
entry->metadata_cipher = arg;
} else if (StartsWith(flag, "sysfs_path=")) {
// The path to trigger device gc by idle-maint of vold.
entry->sysfs_path = arg;

1
fs_mgr/include_fstab/fstab/fstab.h
View file

@ -38,6 +38,7 @@ struct FstabEntry {
std::string fs_options;
std::string key_loc;
std::string metadata_key_dir;
std::string metadata_cipher;
off64_t length = 0;
std::string label;
int partnum = -1;

17
fs_mgr/tests/fs_mgr_test.cpp
View file

@ -895,6 +895,23 @@ source none0 swap defaults keydirectory=/dir/key
EXPECT_EQ("/dir/key", entry->metadata_key_dir);
}
TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_MetadataCipher) {
TemporaryFile tf;
ASSERT_TRUE(tf.fd != -1);
std::string fstab_contents = R"fs(
source none0 swap defaults keydirectory=/dir/key,metadata_cipher=adiantum
)fs";
ASSERT_TRUE(android::base::WriteStringToFile(fstab_contents, tf.path));
Fstab fstab;
EXPECT_TRUE(ReadFstabFromFile(tf.path, &fstab));
ASSERT_EQ(1U, fstab.size());
auto entry = fstab.begin();
EXPECT_EQ("adiantum", entry->metadata_cipher);
}
TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_SysfsPath) {
TemporaryFile tf;
ASSERT_TRUE(tf.fd != -1);