| commit | f1079ed67ba8e84d70b026d1fb7a0f44203a9fe0 | [log] [tgz] |
|---|---|---|
| author | mauronofrio matarrese <poronofrio@gmail.com> | Mon May 25 20:52:57 2020 +0200 |
| committer | bigbiff <bigbiff@teamw.in> | Tue Jun 23 14:44:34 2020 +0000 |
| tree | 87ad63bc350af4b9a3aec7d51ab95d46d2d4defb | |
| parent | bd79db4d6d2d38929ffd748c2929d6fb72666551 [diff] [blame] |
fscrypt: : Use wrapped key for metadata encryption Importing of this commit: https://github.com/LineageOS/android_system_vold/commit/944c48d5a4c6df1eb751b04f52c06adac35ebab6 Change-Id: I048a6c2aeff2591135f47223a99af5ddd215703c
diff --git a/crypto/fscrypt/KeyStorage.cpp b/crypto/fscrypt/KeyStorage.cpp index 9457591..068c069 100755 --- a/crypto/fscrypt/KeyStorage.cpp +++ b/crypto/fscrypt/KeyStorage.cpp
@@ -146,7 +146,7 @@ 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) {