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

Commit 2dac9f47 authored by Tommy Chiu's avatar Tommy Chiu Committed by Automerger Merge Worker
Browse files

Merge "KeyMaster vts: Allow --dump_attestations to show whole... 

Merge "KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION" am: ced9a11b am: e881bbdd am: fd39bf2f am: 7e0b2f5a

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

Change-Id: I374dcb6e309b6dba59179fb829eec6233b9b41f2
parents b893f998 7e0b2f5a

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

+6 −2
Original line number Diff line number Diff line
@@ -243,7 +243,9 @@ TEST_P(DeviceUniqueAttestationTest, Rsa) { 


    EXPECT_EQ(ErrorCode::OK, result);

    EXPECT_EQ(2U, cert_chain.size());

    if (dumpAttestations) dumpContent(bin2hex(cert_chain[0]));

    if (dumpAttestations) {

      for (auto cert_ : cert_chain) dumpContent(bin2hex(cert_));

    }

    auto [err, attestation] = parse_attestation_record(cert_chain[0]);

    ASSERT_EQ(ErrorCode::OK, err);
@@ -287,7 +289,9 @@ TEST_P(DeviceUniqueAttestationTest, Ecdsa) { 


    EXPECT_EQ(ErrorCode::OK, result);

    EXPECT_EQ(2U, cert_chain.size());

    if (dumpAttestations) dumpContent(bin2hex(cert_chain[0]));

    if (dumpAttestations) {

      for (auto cert_ : cert_chain) dumpContent(bin2hex(cert_));

    }

    auto [err, attestation] = parse_attestation_record(cert_chain[0]);

    ASSERT_EQ(ErrorCode::OK, err);