Revert^2 "Make salt in Microdroid's instance img obsolete"
Salt has been used to provide differentiation of secrets of 2
non-protected VMs (as hidden input in DICE). Have hidden input be
derived from instance_id of the (non protected) VM. In all other cases,
it will be all 0s.
Test: Microdroid tests use this code path.
Bug: 291306122
Re-revert: The reason for failures was a different issue(b/291306122),
this patch is harmless.
Change-Id: I86727ce5361b2cf4e9be59b2f8c0c5e76af9d2e8
diff --git a/microdroid_manager/src/instance.rs b/microdroid_manager/src/instance.rs
index 888c451..2d39cd8 100644
--- a/microdroid_manager/src/instance.rs
+++ b/microdroid_manager/src/instance.rs
@@ -273,6 +273,8 @@
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
pub struct MicrodroidData {
+ // `salt` is obsolete, it was used as a differentiator for non-protected VM instances running
+ // same payload. Instance-id (present in DT) is used for that now.
pub salt: Vec<u8>, // Should be [u8; 64] but that isn't serializable.
pub apk_data: ApkData,
pub extra_apks_data: Vec<ApkData>,