system: vold: Use wrapped key for metadata encryption
Wrapped key feature is needed for better security of encryption keys and to
ensure data integrity when crypto key cache is cleared during reset operation
of storage/crypto hardware.
Original patch: https://source.codeaurora.org/quic/la/platform/system/vold/commit/?h=LA.QSSI.11.0.r1-05600-qssi.0&id=c480f913e6abc2757c0d79afba5a3df1c4adc731
[Pig]: Clean up all deprecated codes that were removed during latter
merge.
CRs-Fixed: 2367150
Change-Id: I83d14861bf81e102151fa3417d84008c214a9ac0
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 3eb4599..2be685f 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -322,6 +322,10 @@
return true;
}
+bool is_metadata_wrapped_key_supported() {
+ return GetEntryForMountPoint(&fstab_default, METADATA_MNT_POINT)->fs_mgr_flags.wrapped_key;
+}
+
// Prepare a directory without assigning it an encryption policy. The directory
// will inherit the encryption policy of its parent directory, or will be
// unencrypted if the parent directory is unencrypted.
diff --git a/FsCrypt.h b/FsCrypt.h
index be21fba..d4a482c 100644
--- a/FsCrypt.h
+++ b/FsCrypt.h
@@ -36,3 +36,4 @@
bool fscrypt_destroy_user_storage(const std::string& volume_uuid, userid_t user_id, int flags);
bool fscrypt_destroy_volume_keys(const std::string& volume_uuid);
+bool is_metadata_wrapped_key_supported();
diff --git a/VoldUtil.h b/VoldUtil.h
index ce6b411..e0945bf 100644
--- a/VoldUtil.h
+++ b/VoldUtil.h
@@ -21,3 +21,4 @@
extern android::fs_mgr::Fstab fstab_default;
#define DATA_MNT_POINT "/data"
+#define METADATA_MNT_POINT "/metadata"