[avb] Verify initrd in the payload verification
Bug: 256148034
Test: m pvmfw_img && atest libpvmfw_avb.integration_test
Change-Id: I055838691e0d7dca6d3f1965f2023e3ee69cb9e9
diff --git a/pvmfw/avb/tests/utils.rs b/pvmfw/avb/tests/utils.rs
index aa40bb8..0d9657e 100644
--- a/pvmfw/avb/tests/utils.rs
+++ b/pvmfw/avb/tests/utils.rs
@@ -21,7 +21,7 @@
avb_footer_validate_and_byteswap, avb_vbmeta_image_header_to_host_byte_order, AvbFooter,
AvbVBMetaImageHeader,
};
-use pvmfw_avb::{verify_payload, AvbSlotVerifyError};
+use pvmfw_avb::{verify_payload, AvbSlotVerifyError, DebugLevel};
use std::{
fs,
mem::{size_of, transmute, MaybeUninit},
@@ -38,7 +38,7 @@
kernel: &[u8],
initrd: &[u8],
trusted_public_key: &[u8],
- expected_result: Result<(), AvbSlotVerifyError>,
+ expected_result: Result<DebugLevel, AvbSlotVerifyError>,
) -> Result<()> {
assert_payload_verification_eq(kernel, Some(initrd), trusted_public_key, expected_result)
}
@@ -47,7 +47,7 @@
kernel: &[u8],
initrd: Option<&[u8]>,
trusted_public_key: &[u8],
- expected_result: Result<(), AvbSlotVerifyError>,
+ expected_result: Result<DebugLevel, AvbSlotVerifyError>,
) -> Result<()> {
assert_eq!(expected_result, verify_payload(kernel, initrd, trusted_public_key));
Ok(())