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>
gugelfrei
Neeraj Soni 4 years ago committed by Michael Bestas
parent 792484081d
commit 8df5a5aedd

@ -39,6 +39,7 @@
#include "Checkpoint.h"
#include "CryptoType.h"
#include "EncryptInplace.h"
#include "FsCrypt.h"
#include "KeyStorage.h"
#include "KeyUtil.h"
#include "Keymaster.h"
@ -296,6 +297,8 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
}
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)

Loading…
Cancel
Save