From 566d1cb6e0eb2c1da8f11d3f850135d7d5f13dba Mon Sep 17 00:00:00 2001 From: Tommy Chiu Date: Tue, 11 May 2021 18:09:26 +0800 Subject: [PATCH] KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION This debug option used to dump only leaf certificate. Bug: 187803288 Change-Id: I6cd55597e5127f8aada3dc31ab3e81595f4affbf --- .../4.1/vts/functional/DeviceUniqueAttestationTest.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp index e46cb4868d..0639da8ab1 100644 --- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp @@ -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);