commit b8ca3c5086c428b40c1abde3f41f54c20c685934
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 13 13:29:22 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 13:29:22 2022 +0000
tree 8450cf4d0bdde9ba8ee0ec10eb44780f97934f94
parent af8dbe1d9b4fabb046203c5f389332c57a08f37f
parent c3483877a889c1541f7c3e0428bd5d5b2c748906

Merge "[avb][test] Rename unit test for unsigned image in vbmeta"

libs/avb/src/lib.rs

diff --git a/libs/avb/src/lib.rs b/libs/avb/src/lib.rs
index 81b554d..21b7d2a 100644
--- a/libs/avb/src/lib.rs
+++ b/libs/avb/src/lib.rs
@@ -16,6 +16,8 @@
 
 #![no_std]
 
-mod avb_ops;
+extern crate alloc;
 
-pub use avb_ops::{verify_image, AvbImageVerifyError};
+mod ops;
+
+pub use ops::{verify_image, AvbImageVerifyError};

libs/avb/src/ops.rs

diff --git a/libs/avb/src/avb_ops.rs b/libs/avb/src/ops.rs
similarity index 99%
rename from libs/avb/src/avb_ops.rs
rename to libs/avb/src/ops.rs
index 900e152..429c980 100644
--- a/libs/avb/src/avb_ops.rs
+++ b/libs/avb/src/ops.rs
@@ -19,8 +19,6 @@
 #![allow(dead_code)]
 #![allow(unused_imports)]
 
-extern crate alloc;
-
 use alloc::ffi::CString;
 use avb_bindgen::{
     avb_slot_verify, AvbHashtreeErrorMode_AVB_HASHTREE_ERROR_MODE_EIO,

libs/vbmeta/src/lib.rs

diff --git a/libs/vbmeta/src/lib.rs b/libs/vbmeta/src/lib.rs
index 312bd4f..65d51d2 100644
--- a/libs/vbmeta/src/lib.rs
+++ b/libs/vbmeta/src/lib.rs
@@ -197,11 +197,6 @@
         image.read_exact(footer_slice)?;
         footer.assume_init()
     };
-    // Check the magic matches "AVBf" to suppress misleading logs from libavb.
-    const AVB_FOOTER_MAGIC: [u8; 4] = [0x41, 0x56, 0x42, 0x66];
-    if footer.magic != AVB_FOOTER_MAGIC {
-        return Ok(None);
-    }
     // SAFETY: the function updates the struct in-place.
     if unsafe { avb_footer_validate_and_byteswap(&footer, &mut footer) } {
         Ok(Some(footer))