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

fscrypt: : Use wrapped key for metadata encryption

Browse Source 
Importing of this commit:
https://github.com/LineageOS/android_system_vold/commit/944c48d5a4c6df1eb751b04f52c06adac35ebab6

Change-Id: I048a6c2aeff2591135f47223a99af5ddd215703c
This commit is contained in:
mauronofrio matarrese
2020-05-25 20:52:57 +02:00
committed by bigbiff
parent bd79db4d6d
commit f1079ed67b
6 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/fscrypt/KeyStorage.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ bool generateWrappedKey(userid_t user_id, KeyType key_type,
paramBuilder.push_back(param1);
km::KeyParameter param2;
if ((key_type == KeyType::DE_USER) || (key_type == KeyType::DE_SYS)) {
if ((key_type == KeyType::DE_USER) || (key_type == KeyType::DE_SYS || (key_type == KeyType::ME))) {
param2.tag = (km::Tag) (android::hardware::keymaster::V4_0::KM_TAG_KEY_TYPE);
param2.f.integer = 0;
} else if (key_type == KeyType::CE_USER) {