commit f3d96b100d8b0609c590d5145693139f057b75a8
author Alice Wang <aliceywang@google.com> Thu Dec 15 13:10:47 2022 +0000
committer Alice Wang <aliceywang@google.com> Fri Dec 16 11:27:12 2022 +0000
tree 81de0f0409d63976a3dd3eb8c65496978d4642a4
parent e9d6cfb333cb4b9bd8013ddb5b668ad113e7c745

[avb] Add library libpvmfw_avb_nostd and test it in presubmit

Bug: 237373557
Test: m pvmfw_img && atest libpvmfw_avb.test
Change-Id: I80c19d4081b97ae57d0b50c04d3368b417a6411a

pvmfw/src/main.rs

diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index 79b6f57..039e674 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -38,10 +38,10 @@
     memory::MemoryTracker,
     pci::{allocate_all_virtio_bars, PciError, PciInfo, PciMemory32Allocator},
 };
-use ::avb::verify_image;
 use dice::bcc;
 use libfdt::Fdt;
 use log::{debug, error, info, trace};
+use pvmfw_avb::verify_payload;
 
 fn main(
     fdt: &Fdt,
@@ -71,7 +71,7 @@
     let mut pci_root = unsafe { pci_info.make_pci_root() };
     allocate_all_virtio_bars(&mut pci_root, &mut bar_allocator).map_err(handle_pci_error)?;
 
-    verify_image(signed_kernel, PUBLIC_KEY).map_err(|e| {
+    verify_payload(PUBLIC_KEY).map_err(|e| {
         error!("Failed to verify the payload: {e}");
         RebootReason::PayloadVerificationError
     })?;