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

Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542

Browse source 
Change-Id: I2d891dd6a28c8f599b68a5df840d0d331fc1c440
This commit is contained in:
TreeHugger Robot 2020-04-08 00:24:40 +00:00 committed by Automerger Merge Worker
commit a46dc6fe7a
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
MetadataCrypt.cpp
View file

@ -58,7 +58,7 @@ using namespace android::dm;
// Parsed from metadata options // Parsed from metadata options
struct CryptoOptions { struct CryptoOptions {
struct CryptoType cipher = invalid_crypto_type; struct CryptoType cipher = invalid_crypto_type;
bool is_legacy = false; bool use_legacy_options_format = false;
bool set_dun = true; // Non-legacy driver always sets DUN bool set_dun = true; // Non-legacy driver always sets DUN
bool use_hw_wrapped_key = false; bool use_hw_wrapped_key = false;
}; };
@ -207,7 +207,7 @@ static bool create_crypto_blk_dev(const std::string& dm_name, const std::string&
auto target = std::make_unique<DmTargetDefaultKey>(0, *nr_sec, options.cipher.get_kernel_name(), auto target = std::make_unique<DmTargetDefaultKey>(0, *nr_sec, options.cipher.get_kernel_name(),
hex_key, blk_device, 0); hex_key, blk_device, 0);
if (options.is_legacy) target->SetIsLegacy(); if (options.use_legacy_options_format) target->SetUseLegacyOptionsFormat();
if (options.set_dun) target->SetSetDun(); if (options.set_dun) target->SetSetDun();
if (options.use_hw_wrapped_key) target->SetWrappedKeyV0(); if (options.use_hw_wrapped_key) target->SetWrappedKeyV0();
@ -283,25 +283,30 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
return false; return false;
} }
bool is_legacy; constexpr unsigned int pre_gki_level = 29;
if (!DmTargetDefaultKey::IsLegacy(&is_legacy)) return false; unsigned int options_format_version = android::base::GetUintProperty<unsigned int>(
"ro.crypto.dm_default_key.options_format.version",
(GetFirstApiLevel() <= pre_gki_level ? 1 : 2));
CryptoOptions options; CryptoOptions options;
if (is_legacy) { if (options_format_version == 1) {
if (!data_rec->metadata_encryption.empty()) { if (!data_rec->metadata_encryption.empty()) {
LOG(ERROR) << "metadata_encryption options cannot be set in legacy mode"; LOG(ERROR) << "metadata_encryption options cannot be set in legacy mode";
return false; return false;
} }
options.cipher = legacy_aes_256_xts; options.cipher = legacy_aes_256_xts;
options.is_legacy = true; options.use_legacy_options_format = true;
options.set_dun = android::base::GetBoolProperty("ro.crypto.set_dun", false); options.set_dun = android::base::GetBoolProperty("ro.crypto.set_dun", false);
if (!options.set_dun && data_rec->fs_mgr_flags.checkpoint_blk) { if (!options.set_dun && data_rec->fs_mgr_flags.checkpoint_blk) {
LOG(ERROR) LOG(ERROR)
<< "Block checkpoints and metadata encryption require ro.crypto.set_dun option"; << "Block checkpoints and metadata encryption require ro.crypto.set_dun option";
return false; return false;
} }
} else { } else if (options_format_version == 2) {
if (!parse_options(data_rec->metadata_encryption, &options)) return false; if (!parse_options(data_rec->metadata_encryption, &options)) return false;
} else {
LOG(ERROR) << "Unknown options_format_version: " << options_format_version;
return false;
} }
auto gen = needs_encrypt ? makeGen(options) : neverGen(); auto gen = needs_encrypt ? makeGen(options) : neverGen();