[dice] Move CDI_SIZE to upstream library libdiced_open_dice
This is part of the project of merging the two existing dice
wrapper libraries into one library. The upstream library
libdiced_open_dice will be the merged library.
Test: atest diced_utils_test diced_sample_inputs_test \
diced_test diced_vendor_test
Test: m pvmfw_img microdroid_manager && atest \
microdroid_manager_test
Bug: 267575445
Change-Id: Ic4a5330b87000236a3fdec65cdca8274f9b7c408
diff --git a/libs/dice/src/lib.rs b/libs/dice/src/lib.rs
index 4a1b699..4a45ab4 100644
--- a/libs/dice/src/lib.rs
+++ b/libs/dice/src/lib.rs
@@ -19,7 +19,8 @@
#![no_std]
pub use diced_open_dice::{
- check_result, Config, DiceError, Hash, InputValues, Result, HASH_SIZE, HIDDEN_SIZE,
+ check_result, Cdi, Config, DiceError, Hash, InputValues, Result, CDI_SIZE, HASH_SIZE,
+ HIDDEN_SIZE,
};
pub use open_dice_cbor_bindgen::DiceMode;
@@ -27,11 +28,6 @@
pub mod bcc;
-const CDI_SIZE: usize = open_dice_cbor_bindgen::DICE_CDI_SIZE as usize;
-
-/// Array type of CDIs.
-pub type Cdi = [u8; CDI_SIZE];
-
fn ctx() -> *mut core::ffi::c_void {
core::ptr::null_mut()
}