commit 9c40ecabc17b8379f3f1b9e4a08a6935da4e682e
author Alice Wang <aliceywang@google.com> Fri Feb 03 13:10:24 2023 +0000
committer Alice Wang <aliceywang@google.com> Tue Feb 07 14:14:47 2023 +0000
tree 606903db546988df0902a5a0dc882c14a7fb26fa
parent 6ad72eca4a6c6ec2b63b5d95cb516f1ffae4ae51

[dice] Move format_condig_descriptor to diced_open_dice

Test: atest diced_utils_test diced_sample_inputs_test \
diced_test diced_vendor_test diced_open_dice_cbor_test \
diced_client_test
Test: m pvmfw_img microdroid_manager
Test: atest microdroid_manager_test vmbase_example.integration_test
Bug: 267575445

Change-Id: Iba7f775c1d1a3070c119da546edad38c2bbf67ac

diced/src/sample_inputs.rs

diff --git a/diced/src/sample_inputs.rs b/diced/src/sample_inputs.rs
index 0553327..3f36119 100644
--- a/diced/src/sample_inputs.rs
+++ b/diced/src/sample_inputs.rs
@@ -24,6 +24,7 @@
 use diced_utils::{cbor, to_dice_input_values};
 use keystore2_crypto::ZVec;
 use std::convert::TryInto;
+use std::ffi::CStr;
 use std::io::Write;
 
 /// Sample UDS used to perform the root dice flow by `make_sample_bcc_and_cdis`.
@@ -122,7 +123,7 @@
 fn make_input_values(
     code_hash: dice::Hash,
     authority_hash: dice::Hash,
-    config_name: &str,
+    config_name: &CStr,
     config_version: u64,
     config_resettable: bool,
     mode: Mode,
@@ -131,7 +132,7 @@
     Ok(BinderInputValues {
         codeHash: code_hash,
         config: BinderConfig {
-            desc: dice::bcc::format_config_descriptor(
+            desc: dice::retry_bcc_format_config_descriptor(
                 Some(config_name),
                 Some(config_version),
                 config_resettable,
@@ -201,9 +202,9 @@
         make_input_values(
             CODE_HASH1,
             AUTHORITY_HASH1,
-            "ABL", // config name
-            1,     // config version
-            true,  // resettable
+            CStr::from_bytes_with_nul(b"ABL\0").unwrap(), // config name
+            1,                                            // config version
+            true,                                         // resettable
             Mode::NORMAL,
             HIDDEN1,
         )
@@ -211,9 +212,9 @@
         make_input_values(
             CODE_HASH2,
             AUTHORITY_HASH2,
-            "AVB", // config name
-            1,     // config version
-            true,  // resettable
+            CStr::from_bytes_with_nul(b"AVB\0").unwrap(), // config name
+            1,                                            // config version
+            true,                                         // resettable
             Mode::NORMAL,
             HIDDEN2,
         )
@@ -221,9 +222,9 @@
         make_input_values(
             [0; dice::HASH_SIZE], // code hash
             AUTHORITY_HASH3,
-            "Android", // config name
-            12,        // config version
-            true,      // resettable
+            CStr::from_bytes_with_nul(b"Android\0").unwrap(), // config name
+            12,                                               // config version
+            true,                                             // resettable
             Mode::NORMAL,
             [0; dice::HIDDEN_SIZE], // hidden,
         )