commit f515bb1c4453d6bb01a37d7abaaf4704e27ae00c
author Thomas Altenbach <thomas.altenbach@legrand.com> Fri Apr 26 18:31:57 2024 +0200
committer Fabio Utzig <utzig@utzig.org> Mon Jul 15 20:03:21 2024 -0300
tree f40025461d3a99f3016dc426a4d4ada9d17f4db7
parent fb2cf0ec3da3687b93f28e556ab682bdd4b85223

bootutil: Properly retrieve image headers after interrupted swap-scratch

For swap using scratch, the boot_read_image_header routine, responsible
for reading the image headers, was always looking for the primary and
secondary image's headers at the beginning of respectively the primary
and secondary slots, regardless of the current boot status.

This means if during a swap-scratch upgrade a reset happens after the
sector containing the image header in the primary or secondary slot has
been erased, invalid image headers were read since at that time the
location of the headers has changed.

Currently, this doesn't seem to cause any issue because the swap-scratch
algorithm is implemented in such a way the content of the headers is no
more necessary when the headers are erased. However, to be able to
decrypt the secondary image when copied to the primary slot instead of
when copied to the scratch area, properly reading the secondary image's
header is required even after it has been erased from the secondary
slot.

To that end, the boot_read_image_header is modified to determine from
the boot status the current location of the image headers and to always
read the actual header, no matter the current state of the upgrade
process.

Signed-off-by: Thomas Altenbach <thomas.altenbach@legrand.com>