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>
This commit is contained in:
David Drysdale
2024-01-25 14:26:16 +00:00
committed by Automerger Merge Worker

View File

@@ -149,7 +149,9 @@ TEST_P(BootloaderStateTest, VbmetaDigest) {
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);