commit 88da778d2ab611ccd2e420e2d16a01bc6f122a45
author David Drysdale <drysdale@google.com> Thu Jan 25 13:01:53 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 25 13:01:53 2024 +0000
tree 92c0a52267522c9e2b4559bd4f67c8ed281e6de5
parent 922a49f2788147392031cb05b961462b4c57a513
parent 0ab3d973501b165a2525754480bcba7a2769ef77

Merge "KeyMint: show vbmeta digest values on mismatch" into main

security/keymint/aidl/vts/functional/BootloaderStateTest.cpp

diff --git a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
index 54f187c..808ed18 100644
--- a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
+++ b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
@@ -149,7 +149,9 @@
                                                  digest512.data());
 
     ASSERT_TRUE((attestedVbmetaDigest_ == digest256) || (attestedVbmetaDigest_ == digest512))
-            << "Attested digest does not match computed digest.";
+            << "Attested vbmeta digest (" << bin2hex(attestedVbmetaDigest_)
+            << ") does not match computed digest (sha256: " << bin2hex(digest256)
+            << ", sha512: " << bin2hex(digest512) << ").";
 }
 
 INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest);