| commit | 8c30ff23e089be3cb01947239119a196d9b0ca90 | [log] [tgz] |
|---|---|---|
| author | Catherine Vlasov <cvlasov@google.com> | Fri Nov 15 17:25:49 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 15 17:25:49 2024 +0000 |
| tree | 17974470344022610f4807197d459f20dd466602 | |
| parent | 79ad008d2819d377a5053f9111559e0ec8596cb2 [diff] | |
| parent | 78ade929e3240545bb6e2d6d41ff5c4b8bcd8dda [diff] |
Merge "Correct comment about Verified Boot key on devices with custom root of trust." into main am: 78ade929e3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3349134 Change-Id: Ida7f1bb93b93bf0f841018fd1cfc45ff44972fb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 9c1ab3d..51afa12 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -1904,7 +1904,7 @@ } } - // Verified boot key should be all 0's if the boot state is not verified or self signed + // Verified Boot key should be all zeroes if the boot state is "orange". std::string empty_boot_key(32, '\0'); std::string verified_boot_key_str((const char*)verified_boot_key.data(), verified_boot_key.size());