commit 406be862934b7a8ecb5ac0a36261dc7a055fc1cb
author Neeraj Soni <neersoni@codeaurora.org> Mon May 04 23:49:03 2020 +0530
committer Neeraj Soni <neersoni@codeaurora.org> Wed May 13 12:25:55 2020 +0530
tree 4f6549d11525e9e7008f2fe0e5f07cc8309589a8
parent e5683deb0e6d32cda73d5462093367ad20dc723e

vold: Enable legacy support for wrapped key

Legacy wrapped key support was dropped while merging changes
to support multiple versions of dm-default key driver in kernel.
Fix this by calling legacy API to check wrapped key support for
metadata encryption.

CRs-Fixed: 2678344
Change-Id: I7d9efec09ddf7169cf0b1114b4e16b9fe38cad4b
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 3026611..785e160 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -297,6 +297,8 @@
         }
         options.cipher = legacy_aes_256_xts;
         options.use_legacy_options_format = true;
+        if (is_metadata_wrapped_key_supported())
+            options.use_hw_wrapped_key = true;
         options.set_dun = android::base::GetBoolProperty("ro.crypto.set_dun", false);
         if (!options.set_dun && data_rec->fs_mgr_flags.checkpoint_blk) {
             LOG(ERROR)