commit a777366899039672197baf629e823f8eef4fb361
author Alice Wang <aliceywang@google.com> Fri Feb 03 09:37:17 2023 +0000
committer Alice Wang <aliceywang@google.com> Mon Feb 06 13:51:53 2023 +0000
tree c12b24ddfc90c464efc8a3437d8d384f4b8472f8
parent a7e4ce09e6b2dffae2cf04cfdd0112fe20efefdb

[dice] Use dice::InputValues instead of InputValuesOwned

Test: m pvmfw_img microdroid_manager && atest \
microdroid_manager_test
Bug: 267575445
Change-Id: I4323aa39ba7ae4d545a71d0ce10a03e27be6c62a

Change-Id: I890e3d8607b5bff60723fd97b7345c1168629537

pvmfw/src/dice.rs

diff --git a/pvmfw/src/dice.rs b/pvmfw/src/dice.rs
index 4e1e60a..42cc802 100644
--- a/pvmfw/src/dice.rs
+++ b/pvmfw/src/dice.rs
@@ -22,6 +22,7 @@
 use dice::Config;
 use dice::DiceMode;
 use dice::InputValues;
+use dice::HIDDEN_SIZE;
 use pvmfw_avb::{DebugLevel, Digest, VerifiedBootData};
 
 fn to_dice_mode(debug_level: DebugLevel) -> DiceMode {
@@ -61,13 +62,11 @@
     let config = &config_descriptor_buffer[..config_descriptor_size];
 
     let input_values = InputValues::new(
-        &code_hash,
-        None, // code_descriptor
+        code_hash,
         Config::Descriptor(config),
-        &auth_hash,
-        None, // authority_descriptor
+        auth_hash,
         mode,
-        None, // TODO(b/249723852): Get salt from instance.img (virtio-blk) and/or TRNG.
+        [0u8; HIDDEN_SIZE], // TODO(b/249723852): Get salt from instance.img (virtio-blk) and/or TRNG.
     );
 
     bcc.main_flow(&input_values, next_bcc)