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

Commit 82afff9e authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "[dice] Pass InputValues to dice::execute_steps without conversion" am: 6331fd4d 

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



Change-Id: Ic0132b40465b5d27d4601507059bf1572c829e77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 962b7bb5 6331fd4d

security/dice/aidl/vts/functional/dice_demote_test.rs

+1 −9
Original line number Diff line number Diff line
@@ -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(),

security/dice/aidl/vts/functional/dice_test.rs

+2 −10
Original line number Diff line number Diff line
@@ -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(),