PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4crypt: change to upgrade key if export fails

Browse Source 
Add support to upgrade key when export fails with KEY_REQUIRES_UPGRADE.

Ported from
https://source.codeaurora.org/quic/la/platform/system/vold/commit/?h=LA.UM.7.9.r1-06100-sm6150.0&id=85c46eaacc60290db5e71380d89eb4d99ed67995

Change-Id: Ic64be8ade00c0b0d014370ecc9341b1ecc9b0d7a
This commit is contained in:
Peter Cai
2019-05-25 21:12:29 +08:00
committed by big biff
parent 90edd2e867
commit 05cd3f8616
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/ext4crypt/KeyStorage4.cpp
View File

@@ -165,10 +165,28 @@ bool getEphemeralWrappedKey(km::KeyFormat format, KeyBuffer& kmKey, KeyBuffer* k
std::string key_temp;
Keymaster keymaster;
if (!keymaster) return false;
if (!keymaster.exportKey(format, kmKey, "!", "!", &key_temp)) return false;
*key = KeyBuffer(key_temp.size());
memcpy(reinterpret_cast<void*>(key->data()), key_temp.c_str(), key->size());
return true;
//Export once, if upgrade needed, upgrade and export again
bool export_again = true;
while (export_again) {
export_again = false;
auto ret = keymaster.exportKey(format, kmKey, "!", "!", &key_temp);
if (ret == km::ErrorCode::OK) {
*key = KeyBuffer(key_temp.size());
memcpy(reinterpret_cast<void*>(key->data()), key_temp.c_str(), key->size());
return true;
}
if (ret != km::ErrorCode::KEY_REQUIRES_UPGRADE) return false;
LOG(DEBUG) << "Upgrading key";
std::string kmKeyStr(reinterpret_cast<const char*>(kmKey.data()), kmKey.size());
std::string newKey;
if (!keymaster.upgradeKey(kmKeyStr, km::AuthorizationSet(), &newKey)) return false;
memcpy(reinterpret_cast<void*>(kmKey.data()), newKey.c_str(), kmKey.size());
LOG(INFO) << "Key upgraded";
export_again = true;
}
//Should never come here
return false;
}
static std::pair<km::AuthorizationSet, km::HardwareAuthToken> beginParams(