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

Merge "Replace an outdated TODO in Keystore::exportKey" am: aadef5cd8a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2031283

Change-Id: I426731cf85fb49110ba7eac2ea472008495b756f
This commit is contained in:
Treehugger Robot 2022-03-19 04:08:41 +00:00 committed by Automerger Merge Worker
commit 7ff572e24e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Keystore.cpp
View file

@ -166,7 +166,13 @@ bool Keystore::exportKey(const KeyBuffer& ksKey, std::string* key) {
*key = std::string(ephemeral_key_response.ephemeralKey.begin(),
ephemeral_key_response.ephemeralKey.end());
// TODO b/185811713 store the upgraded key blob if provided and delete the old key blob.
// vold intentionally ignores ephemeral_key_response.upgradedBlob, since the
// concept of "upgrading" doesn't make sense for TAG_STORAGE_KEY keys
// (hardware-wrapped inline encryption keys). These keys are only meant as
// a substitute for raw keys; they still go through vold's usual layer of
// key wrapping, which already handles version binding. So, vold just keeps
// using the original blobs for TAG_STORAGE_KEY keys. If KeyMint "upgrades"
// them anyway, then they'll just get re-upgraded before each use.
ret = true;
out: