| commit | da1791272fdda65bcdfe8b2a34e460e526eee522 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jan 25 14:26:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 25 14:26:16 2024 +0000 |
| tree | f128ab550e48bf09ddffd1820f94706cbd493a21 | |
| parent | 410d78f45920919d46c511de3b54a0d46ce2d1ef [diff] | |
| parent | 34ea1a81cd964278ce5f24edffff9c5c572117bd [diff] |
Merge "KeyMint: show vbmeta digest values on mismatch" into main am: 88da778d2a am: 34ea1a81cd Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2927217 Change-Id: Ia65a586313f852e2530a3b15f48a470c6d1f985d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);