Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c160e3a1 authored Feb 07, 2025 by Chan Wang Committed by Automerger Merge Worker Feb 07, 2025

Merge "Update housing crate for OwnedDiceArtifactsWithExplicitKey" into main...

Merge "Update housing crate for OwnedDiceArtifactsWithExplicitKey" into main am: 77af1a86 am: 4b6c26ae

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3477932

Change-Id: I8daefc139d9800360906343115b06300254e3628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f7c20d02 4b6c26ae

security/secretkeeper/aidl/vts/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ rust_library {
		"libciborium",
		"libcoset",
		"libdiced_open_dice",
		"libexplicitkeydice",
		"libhex",
		"liblog_rust",
		"libsecretkeeper_client",
		@@ -54,6 +55,7 @@ rust_test {
		"libciborium",
		"libcoset",
		"libdice_policy_builder",
		"libexplicitkeydice",
		"liblog_rust",
		"libsecretkeeper_client",
		"libsecretkeeper_comm_nostd",
		@@ -77,6 +79,7 @@ rust_binary {
		"libclap",
		"libcoset",
		"libdice_policy_builder",
		"libexplicitkeydice",
		"libhex",
		"liblog_rust",
		"libsecretkeeper_client",

security/secretkeeper/aidl/vts/dice_sample.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ use diced_open_dice::{
		retry_bcc_main_flow, retry_dice_main_flow, Config, DiceArtifacts, DiceConfigValues, DiceError,
		DiceMode, InputValues, OwnedDiceArtifacts, HASH_SIZE, HIDDEN_SIZE,
		};
		use explicitkeydice::OwnedDiceArtifactsWithExplicitKey;
		use log::error;
		use secretkeeper_client::dice::OwnedDiceArtifactsWithExplicitKey;

		/// Sample UDS used to perform the root DICE flow by `make_sample_bcc_and_cdis`.
		const UDS: &[u8; CDI_SIZE] = &[

security/secretkeeper/aidl/vts/secretkeeper_cli.rs

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@ use dice_policy_builder::{
		WILDCARD_FULL_ARRAY,
		};

		use secretkeeper_client::{dice::OwnedDiceArtifactsWithExplicitKey, SkSession};
		use explicitkeydice::OwnedDiceArtifactsWithExplicitKey;
		use secretkeeper_client::SkSession;
		use secretkeeper_comm::data_types::{
		error::SecretkeeperError,
		packet::{ResponsePacket, ResponseType},

security/secretkeeper/aidl/vts/secretkeeper_test_client.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ use authgraph_boringssl as boring;
		use authgraph_core::key;
		use coset::{CborOrdering, CborSerializable, CoseEncrypt0, CoseKey};
		use dice_policy_builder::{TargetEntry, ConstraintSpec, ConstraintType, MissingAction, WILDCARD_FULL_ARRAY, policy_for_dice_chain};
		use explicitkeydice::OwnedDiceArtifactsWithExplicitKey;
		use rdroidtest::{ignore_if, rdroidtest};
		use secretkeeper_client::dice::OwnedDiceArtifactsWithExplicitKey;
		use secretkeeper_client::{SkSession, Error as SkClientError};
		use secretkeeper_core::cipher;
		use secretkeeper_comm::data_types::error::SecretkeeperError;