commit af8dbe1d9b4fabb046203c5f389332c57a08f37f
author Alice Wang <aliceywang@google.com> Tue Dec 13 13:22:13 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 13 13:22:13 2022 +0000
tree 0ac534af89979d392c2cdc8bddd2728a47e34d90
parent badc1ab8c77be4e75976ebf0ef9c91b876597755
parent 2999e6955d0c3aff295898704e1a42ededc55b1d

Merge "[avb] Remove redundant AVB footer magic check"

libs/vbmeta/src/lib.rs

diff --git a/libs/vbmeta/src/lib.rs b/libs/vbmeta/src/lib.rs
index 8e81ea4..12f1e3f 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))