commit fd39bf2f4579f836a5df8d44f683341e94884fa9
author Tommy Chiu <tommychiu@google.com> Thu May 13 01:25:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 01:25:20 2021 +0000
tree b0114e4b4ae8c1a590b955e9244d9442ca6cfa4c
parent ef744ddd5fa38943f07423fd48d41cb2ab7d6a97
parent e881bbdda7b9b1a40cce88ca9040d409f4cfe65f

Merge "KeyMaster vts: Allow --dump_attestations to show whole DEVICE_UNIQUE_ATTESTATION" am: ced9a11bbe am: e881bbdda7

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

Change-Id: I8a8d954559fc68015d5aa0665dc76a88365c20e9

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
index e46cb48..0639da8 100644
--- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -243,7 +243,9 @@
 
     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 @@
 
     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);