[dice] Use libdiced_open_dice_nostd for dice input and config
Bug: 267575445
Test: m pvmfw_img microdroid_manager && atest \
microdroid_manager_test
Change-Id: I5ac3b8a02ca3dfb3ac591db5ea266aa5b5a363b9
diff --git a/pvmfw/src/dice.rs b/pvmfw/src/dice.rs
index 49218b0..4e1e60a 100644
--- a/pvmfw/src/dice.rs
+++ b/pvmfw/src/dice.rs
@@ -19,7 +19,7 @@
use dice::bcc::format_config_descriptor;
use dice::bcc::Handover;
use dice::hash;
-use dice::ConfigType;
+use dice::Config;
use dice::DiceMode;
use dice::InputValues;
use pvmfw_avb::{DebugLevel, Digest, VerifiedBootData};
@@ -59,14 +59,13 @@
false, // resettable
)?;
let config = &config_descriptor_buffer[..config_descriptor_size];
- let config = ConfigType::Descriptor(config);
let input_values = InputValues::new(
&code_hash,
None, // code_descriptor
- &config,
- Some(&auth_hash),
- None, // auth_descriptor
+ Config::Descriptor(config),
+ &auth_hash,
+ None, // authority_descriptor
mode,
None, // TODO(b/249723852): Get salt from instance.img (virtio-blk) and/or TRNG.
);