Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[dice] Pass InputValues to dice::execute_steps without conversion" am: 6331fd4d5a am: 82afff9ebf

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

Change-Id: I74696e6e02b6fe0237d4a7da4ada9e03b7c277e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alice Wang
2023-02-02 21:43:37 +00:00
committed by Automerger Merge Worker
parent 8639c667d6 82afff9ebf
commit 101e9c5ec9
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
security/dice/aidl/vts/functional/dice_demote_test.rs
View File

@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use diced_open_dice_cbor as dice;
use diced_sample_inputs;
use diced_utils;
use std::convert::TryInto;
@@ -44,14 +43,7 @@ fn demote_test() {
)
.unwrap();
let input_values: Vec<diced_utils::InputValues> = input_values
.iter()
.map(|v| v.into())
.collect();
let artifacts = artifacts
.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
.unwrap();
let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),

12
security/dice/aidl/vts/functional/dice_test.rs
View File

@@ -12,10 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use diced_open_dice_cbor as dice;
use diced_sample_inputs;
use diced_utils;
use std::convert::{TryInto, Into};
use std::convert::TryInto;
mod utils;
use utils::with_connection;
@@ -44,14 +43,7 @@ fn equivalence_test() {
)
.unwrap();
let input_values: Vec<diced_utils::InputValues> = input_values
.iter()
.map(|v| v.into())
.collect();
let artifacts = artifacts
.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
.unwrap();
let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),