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

microdroid_manager/src/dice.rs

diff --git a/microdroid_manager/src/dice.rs b/microdroid_manager/src/dice.rs
index 739c944..a7288b6 100644
--- a/microdroid_manager/src/dice.rs
+++ b/microdroid_manager/src/dice.rs
@@ -17,7 +17,7 @@
 use anyhow::{bail, Context, Error, Result};
 use byteorder::{NativeEndian, ReadBytesExt};
 use diced_open_dice_cbor::{
-    Config, ContextImpl, DiceMode, Hash, Hidden, InputValuesOwned, OpenDiceCborContext, CDI_SIZE,
+    Config, ContextImpl, DiceMode, Hash, Hidden, InputValues, OpenDiceCborContext, CDI_SIZE,
 };
 use keystore2_crypto::ZVec;
 use libc::{c_void, mmap, munmap, MAP_FAILED, MAP_PRIVATE, PROT_READ};
@@ -142,11 +142,10 @@
         debug: bool,
         hidden: Hidden,
     ) -> Result<DiceContext> {
-        let input_values = InputValuesOwned::new(
+        let input_values = InputValues::new(
             code_hash,
             Config::Descriptor(config_desc),
             authority_hash,
-            None,
             if debug { DiceMode::kDiceModeDebug } else { DiceMode::kDiceModeNormal },
             hidden,
         );