tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Sk VTS: Use libdice_policy_builder" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-01-27 17:52:53 +00:00 committed by Gerrit Code Review
commit 9ef5917d40
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/secretkeeper/aidl/vts/Android.bp
View file

@ -50,7 +50,7 @@ rust_test {
"libbinder_rs", "libbinder_rs",
"libciborium", "libciborium",
"libcoset", "libcoset",
"libdice_policy", "libdice_policy_builder",
"liblog_rust", "liblog_rust",
"libsecretkeeper_client", "libsecretkeeper_client",
"libsecretkeeper_comm_nostd", "libsecretkeeper_comm_nostd",
@ -72,7 +72,7 @@ rust_binary {
"libbinder_rs", "libbinder_rs",
"libclap", "libclap",
"libcoset", "libcoset",
"libdice_policy", "libdice_policy_builder",
"libhex", "libhex",
"liblog_rust", "liblog_rust",
"libsecretkeeper_client", "libsecretkeeper_client",

5
security/secretkeeper/aidl/vts/secretkeeper_cli.rs
View file

@ -24,7 +24,8 @@ use authgraph_boringssl::BoringSha256;
use authgraph_core::traits::Sha256; use authgraph_core::traits::Sha256;
use clap::{Args, Parser, Subcommand}; use clap::{Args, Parser, Subcommand};
use coset::CborSerializable; use coset::CborSerializable;
use dice_policy::{ConstraintSpec, ConstraintType, DicePolicy, MissingAction}; use dice_policy_builder::{ConstraintSpec, ConstraintType, MissingAction, policy_for_dice_chain};
use secretkeeper_client::{dice::OwnedDiceArtifactsWithExplicitKey, SkSession}; use secretkeeper_client::{dice::OwnedDiceArtifactsWithExplicitKey, SkSession};
use secretkeeper_comm::data_types::{ use secretkeeper_comm::data_types::{
error::SecretkeeperError, error::SecretkeeperError,
@ -146,7 +147,7 @@ impl SkClient {
MissingAction::Ignore, MissingAction::Ignore,
), ),
]; ];
DicePolicy::from_dice_chain(dice, &constraint_spec) policy_for_dice_chain(dice, &constraint_spec)
.unwrap() .unwrap()
.to_vec() .to_vec()
.context("serialize DICE policy") .context("serialize DICE policy")

4
security/secretkeeper/aidl/vts/secretkeeper_test_client.rs
View file

@ -20,7 +20,7 @@ use authgraph_vts_test as ag_vts;
use authgraph_boringssl as boring; use authgraph_boringssl as boring;
use authgraph_core::key; use authgraph_core::key;
use coset::{CborSerializable, CoseEncrypt0}; use coset::{CborSerializable, CoseEncrypt0};
use dice_policy::{ConstraintSpec, ConstraintType, DicePolicy, MissingAction}; use dice_policy_builder::{ConstraintSpec, ConstraintType, MissingAction, policy_for_dice_chain};
use rdroidtest::{ignore_if, rdroidtest}; use rdroidtest::{ignore_if, rdroidtest};
use secretkeeper_client::dice::OwnedDiceArtifactsWithExplicitKey; use secretkeeper_client::dice::OwnedDiceArtifactsWithExplicitKey;
use secretkeeper_client::SkSession; use secretkeeper_client::SkSession;
@ -258,7 +258,7 @@ fn sealing_policy(dice: &[u8]) -> Vec<u8> {
), ),
]; ];
DicePolicy::from_dice_chain(dice, &constraint_spec).unwrap().to_vec().unwrap() policy_for_dice_chain(dice, &constraint_spec).unwrap().to_vec().unwrap()
} }
/// Perform AuthGraph key exchange, returning the session keys and session ID. /// Perform AuthGraph key exchange, returning the session keys and session ID.