commit 0ab3d973501b165a2525754480bcba7a2769ef77
author David Drysdale <drysdale@google.com> Wed Dec 20 17:12:03 2023 +0000
committer David Drysdale <drysdale@google.com> Thu Jan 25 11:32:17 2024 +0000
tree c357b00def15fcaa01ac40f0cbb9dbad694fe044
parent 5e7fcb4bbda34bdef17b5797efc0dc79f5af574c

KeyMint: show vbmeta digest values on mismatch

Bug: 314044749
Test: VtsAidlKeyMintTargetTest
Change-Id: I0db1af44445fd5c73517a82eec9f3208fd305b21

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);