pvmfw: update avb Ops lifetimes
libavb_rs Ops lifetimes now distinguish between the Ops lifetime and the
preloaded partition lifetimes, so that we can more easily re-use Ops
objects and return verification data out of functions without also
carrying the Ops around.
Bug: b/330335215
Test: atest libpvmfw_avb.integration_test
Change-Id: Ie4e07f8d079a7408f99f7a72ad4885bbfa09c69b
diff --git a/pvmfw/avb/src/verify.rs b/pvmfw/avb/src/verify.rs
index 2ebe9a1..038b1d6 100644
--- a/pvmfw/avb/src/verify.rs
+++ b/pvmfw/avb/src/verify.rs
@@ -280,11 +280,10 @@
}
let initrd = initrd.unwrap();
- let mut initrd_ops = Ops::new(&payload);
let (debug_level, initrd_descriptor) =
- if verify_initrd(&mut initrd_ops, PartitionName::InitrdNormal, initrd).is_ok() {
+ if verify_initrd(&mut ops, PartitionName::InitrdNormal, initrd).is_ok() {
(DebugLevel::None, hash_descriptors.initrd_normal)
- } else if verify_initrd(&mut initrd_ops, PartitionName::InitrdDebug, initrd).is_ok() {
+ } else if verify_initrd(&mut ops, PartitionName::InitrdDebug, initrd).is_ok() {
(DebugLevel::Full, hash_descriptors.initrd_debug)
} else {
return Err(SlotVerifyError::Verification(None).into());