tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for v2 of dm-default-key

Browse source 
Version 2 of dm-default-key has an extra parameter and always sets the
DUN.

Bug: 147814592
Test: Cuttlefish boots with keydirectory flag
Test: Crosshatch formatted before this change boots after it
Change-Id: I59081e385324d2e34a5f252286a97938d6ffb79b
This commit is contained in:
Paul Crowley 2020-01-28 10:37:39 -08:00
parent c9b92f0c17
commit 92a14b6b16
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MetadataCrypt.cpp
View file

@ -158,6 +158,9 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const FstabEntry*
uint64_t nr_sec;
if (!get_number_of_sectors(data_rec->blk_device, &nr_sec)) return false;
bool is_legacy;
if (!DmTargetDefaultKey::IsLegacy(&is_legacy)) return false;
KeyBuffer hex_key_buffer;
if (android::vold::StrToHex(key, hex_key_buffer) != android::OK) {
LOG(ERROR) << "Failed to turn key to hex";
@ -165,15 +168,16 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const FstabEntry*
}
std::string hex_key(hex_key_buffer.data(), hex_key_buffer.size());
bool set_dun = android::base::GetBoolProperty("ro.crypto.set_dun", false);
// Non-legacy driver always sets DUN
bool set_dun = !is_legacy || android::base::GetBoolProperty("ro.crypto.set_dun", false);
if (!set_dun && data_rec->fs_mgr_flags.checkpoint_blk) {
LOG(ERROR) << "Block checkpoints and metadata encryption require ro.crypto.set_dun option";
return false;
}
DmTable table;
table.Emplace<DmTargetDefaultKey>(0, nr_sec, "AES-256-XTS", hex_key, data_rec->blk_device, 0,
set_dun);
table.Emplace<DmTargetDefaultKey>(0, nr_sec, is_legacy ? "AES-256-XTS" : "aes-xts-plain64",
hex_key, data_rec->blk_device, 0, is_legacy, set_dun);
auto& dm = DeviceMapper::Instance();
for (int i = 0;; i++) {