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

Add support for v2 of dm-default-key am: f1b264f17c

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

32
fs_mgr/libdm/dm_target.cpp
View file

@ -243,15 +243,43 @@ std::string DmTargetCrypt::GetParameterString() const {
return android::base::Join(argv, " "); return android::base::Join(argv, " ");
} }
const std::string DmTargetDefaultKey::name_ = "default-key";
bool DmTargetDefaultKey::IsLegacy(bool* result) {
DeviceMapper& dm = DeviceMapper::Instance();
DmTargetTypeInfo info;
if (!dm.GetTargetByName(name_, &info)) return false;
// dm-default-key was modified to be like dm-crypt with version 2
*result = !info.IsAtLeast(2, 0, 0);
return true;
}
bool DmTargetDefaultKey::Valid() const {
bool real_is_legacy;
if (!DmTargetDefaultKey::IsLegacy(&real_is_legacy)) return false;
if (real_is_legacy != is_legacy_) return false;
if (!is_legacy_ && !set_dun_) return false;
return true;
}
std::string DmTargetDefaultKey::GetParameterString() const { std::string DmTargetDefaultKey::GetParameterString() const {
std::vector<std::string> argv; std::vector<std::string> argv;
argv.emplace_back(cipher_); argv.emplace_back(cipher_);
argv.emplace_back(key_); argv.emplace_back(key_);
if (!is_legacy_) {
argv.emplace_back("0"); // iv_offset
}
argv.emplace_back(blockdev_); argv.emplace_back(blockdev_);
argv.push_back(std::to_string(start_sector_)); argv.push_back(std::to_string(start_sector_));
std::vector<std::string> extra_argv; std::vector<std::string> extra_argv;
if (set_dun_) { if (is_legacy_) {
extra_argv.emplace_back("set_dun"); if (set_dun_) { // v2 always sets the DUN.
extra_argv.emplace_back("set_dun");
}
} else {
extra_argv.emplace_back("allow_discards");
extra_argv.emplace_back("sector_size:4096");
extra_argv.emplace_back("iv_large_sectors");
} }
if (!extra_argv.empty()) { if (!extra_argv.empty()) {
argv.emplace_back(std::to_string(extra_argv.size())); argv.emplace_back(std::to_string(extra_argv.size()));

19
fs_mgr/libdm/dm_test.cpp
View file

@ -516,10 +516,25 @@ TEST(libdm, CryptArgs) {
} }
TEST(libdm, DefaultKeyArgs) { TEST(libdm, DefaultKeyArgs) {
DmTargetDefaultKey target(0, 4096, "AES-256-XTS", "abcdef0123456789", "/dev/loop0", 0); DmTargetTypeInfo info;
DeviceMapper& dm = DeviceMapper::Instance();
if (!dm.GetTargetByName("default-key", &info)) {
cout << "default-key module not enabled; skipping test" << std::endl;
return;
}
bool is_legacy;
ASSERT_TRUE(DmTargetDefaultKey::IsLegacy(&is_legacy));
// set_dun only in the non-is_legacy case
DmTargetDefaultKey target(0, 4096, "AES-256-XTS", "abcdef0123456789", "/dev/loop0", 0,
is_legacy, !is_legacy);
ASSERT_EQ(target.name(), "default-key"); ASSERT_EQ(target.name(), "default-key");
ASSERT_TRUE(target.Valid()); ASSERT_TRUE(target.Valid());
ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 /dev/loop0 0"); if (is_legacy) {
ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 /dev/loop0 0");
} else {
ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 0 /dev/loop0 0");
}
} }
TEST(libdm, DeleteDeviceWithTimeout) { TEST(libdm, DeleteDeviceWithTimeout) {

10
fs_mgr/libdm/include/libdm/dm_target.h
View file

@ -281,23 +281,27 @@ class DmTargetDefaultKey final : public DmTarget {
public: public:
DmTargetDefaultKey(uint64_t start, uint64_t length, const std::string& cipher, DmTargetDefaultKey(uint64_t start, uint64_t length, const std::string& cipher,
const std::string& key, const std::string& blockdev, uint64_t start_sector, const std::string& key, const std::string& blockdev, uint64_t start_sector,
bool set_dun = false) bool is_legacy, bool set_dun)
: DmTarget(start, length), : DmTarget(start, length),
cipher_(cipher), cipher_(cipher),
key_(key), key_(key),
blockdev_(blockdev), blockdev_(blockdev),
start_sector_(start_sector), start_sector_(start_sector),
is_legacy_(is_legacy),
set_dun_(set_dun) {} set_dun_(set_dun) {}
std::string name() const override { return "default-key"; } std::string name() const override { return name_; }
bool Valid() const override { return true; } bool Valid() const override;
std::string GetParameterString() const override; std::string GetParameterString() const override;
static bool IsLegacy(bool* result);
private: private:
static const std::string name_;
std::string cipher_; std::string cipher_;
std::string key_; std::string key_;
std::string blockdev_; std::string blockdev_;
uint64_t start_sector_; uint64_t start_sector_;
bool is_legacy_;
bool set_dun_; bool set_dun_;
}; };