commit 9431129ce375711b3b6027ad0ecdeff60a0b783b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 19 08:09:40 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 19 08:09:40 2024 -0800
tree 01146fa9ee397ed31fd76ecc0637b499e078e6c1
parent 840af5ba4ec1623434759634f22387fbb05a7b4b
parent 125c3dcfc4b12ebc9b7a8eb1d067622cb7002609

Merge "Handle updated signature of PublicKeyRejected" into main am: 125c3dcfc4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3422160

Change-Id: Id8e0c0eba5d4b37306d02987930cf4c8dddb714d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

guest/pvmfw/avb/tests/api_test.rs

diff --git a/guest/pvmfw/avb/tests/api_test.rs b/guest/pvmfw/avb/tests/api_test.rs
index 0ed0279..23e05d4 100644
--- a/guest/pvmfw/avb/tests/api_test.rs
+++ b/guest/pvmfw/avb/tests/api_test.rs
@@ -190,7 +190,7 @@
         &load_latest_signed_kernel()?,
         &load_latest_initrd_normal()?,
         /* trusted_public_key= */ &[0u8; 0],
-        SlotVerifyError::PublicKeyRejected.into(),
+        SlotVerifyError::PublicKeyRejected(None).into(),
     )
 }
 
@@ -200,7 +200,7 @@
         &load_latest_signed_kernel()?,
         &load_latest_initrd_normal()?,
         /* trusted_public_key= */ &[0u8; 512],
-        SlotVerifyError::PublicKeyRejected.into(),
+        SlotVerifyError::PublicKeyRejected(None).into(),
     )
 }
 
@@ -210,7 +210,7 @@
         &load_latest_signed_kernel()?,
         &load_latest_initrd_normal()?,
         &fs::read(PUBLIC_KEY_RSA2048_PATH)?,
-        SlotVerifyError::PublicKeyRejected.into(),
+        SlotVerifyError::PublicKeyRejected(None).into(),
     )
 }