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/diced_client_test.rs

diff --git a/diced/src/diced_client_test.rs b/diced/src/diced_client_test.rs
index f579a4e..054b2d1 100644
--- a/diced/src/diced_client_test.rs
+++ b/diced/src/diced_client_test.rs
@@ -22,6 +22,7 @@
 use diced_open_dice_cbor as dice;
 use nix::libc::uid_t;
 use std::convert::TryInto;
+use std::ffi::CString;
 
 static DICE_NODE_SERVICE_NAME: &str = "android.security.dice.IDiceNode";
 static DICE_MAINTENANCE_SERVICE_NAME: &str = "android.security.dice.IDiceMaintenance";
@@ -106,10 +107,11 @@
 }
 
 fn client_input_values(uid: uid_t) -> BinderInputValues {
+    let desc = CString::new(format!("{}", uid)).unwrap();
     BinderInputValues {
         codeHash: [0; dice::HASH_SIZE],
         config: BinderConfig {
-            desc: dice::bcc::format_config_descriptor(Some(&format!("{}", uid)), None, true)
+            desc: dice::retry_bcc_format_config_descriptor(Some(desc.as_c_str()), None, true)
                 .unwrap(),
         },
         authorityHash: [0; dice::HASH_SIZE],