commit 5aeed337a28e769f75c49bfcfca134f6aec310f0
author Alice Wang <aliceywang@google.com> Thu Feb 02 09:42:21 2023 +0000
committer Alice Wang <aliceywang@google.com> Fri Feb 03 12:14:35 2023 +0000
tree 7e239c32f66a940c3bb6b50457e39b371460181d
parent 6f8596712943ca2807b0f5444473bf7c25ecb6e5

[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

microdroid_manager/src/dice.rs

diff --git a/microdroid_manager/src/dice.rs b/microdroid_manager/src/dice.rs
index e740ed4..739c944 100644
--- a/microdroid_manager/src/dice.rs
+++ b/microdroid_manager/src/dice.rs
@@ -17,8 +17,7 @@
 use anyhow::{bail, Context, Error, Result};
 use byteorder::{NativeEndian, ReadBytesExt};
 use diced_open_dice_cbor::{
-    Config, ContextImpl, DiceMode, InputValuesOwned, OpenDiceCborContext, CDI_SIZE, HASH_SIZE,
-    HIDDEN_SIZE,
+    Config, ContextImpl, DiceMode, Hash, Hidden, InputValuesOwned, OpenDiceCborContext, CDI_SIZE,
 };
 use keystore2_crypto::ZVec;
 use libc::{c_void, mmap, munmap, MAP_FAILED, MAP_PRIVATE, PROT_READ};
@@ -137,11 +136,11 @@
 
     pub fn derive(
         self,
-        code_hash: [u8; HASH_SIZE],
+        code_hash: Hash,
         config_desc: &[u8],
-        authority_hash: [u8; HASH_SIZE],
+        authority_hash: Hash,
         debug: bool,
-        hidden: [u8; HIDDEN_SIZE],
+        hidden: Hidden,
     ) -> Result<DiceContext> {
         let input_values = InputValuesOwned::new(
             code_hash,