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

Commit 77af1a86 authored Feb 07, 2025 by Chan Wang Committed by Gerrit Code Review Feb 07, 2025

Merge "Update housing crate for OwnedDiceArtifactsWithExplicitKey" into main

parents 0a0396c5 1a5a387a

security/secretkeeper/aidl/vts/Android.bp

+3 −0

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

security/secretkeeper/aidl/vts/dice_sample.rs

+1 −1

Original line number	Original line	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,		retry_bcc_main_flow, retry_dice_main_flow, Config, DiceArtifacts, DiceConfigValues, DiceError,
	DiceMode, InputValues, OwnedDiceArtifacts, HASH_SIZE, HIDDEN_SIZE,		DiceMode, InputValues, OwnedDiceArtifacts, HASH_SIZE, HIDDEN_SIZE,
	};		};
			use explicitkeydice::OwnedDiceArtifactsWithExplicitKey;
	use log::error;		use log::error;
	use secretkeeper_client::dice::OwnedDiceArtifactsWithExplicitKey;

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

security/secretkeeper/aidl/vts/secretkeeper_cli.rs

+2 −1

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

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

security/secretkeeper/aidl/vts/secretkeeper_test_client.rs

+1 −1

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