scripts: imgtool: Fix img verify for hex file format

Currently imgtool --verify fails for hex files with: Invalid image magic; is this an MCUboot image? Added support for hex files by converting hex to bin using IntelHex::tobinstr(). Reusing image.load() needs a bit of rework, maybe a common load method will be done in the future,§§:wq Signed-off-by: Lucian Zala <[email protected]>
mcu-tools · Jan 16, 2024 · a771461 · a771461
1 parent c3a72e9
commit a771461
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/scripts/imgtool/image.py b/scripts/imgtool/image.py
@@ -623,8 +623,15 @@ def pad_to(self, size):
 
     @staticmethod
     def verify(imgfile, key):
-        with open(imgfile, "rb") as f:
-            b = f.read()
+        ext = os.path.splitext(imgfile)[1][1:].lower()
+        try:
+            if ext == INTEL_HEX_EXT:
+                b = IntelHex(imgfile).tobinstr()
+            else:
+                with open(imgfile, 'rb') as f:
+                    b = f.read()
+        except FileNotFoundError:
+            raise click.UsageError("Input file not found")
 
         magic, _, header_size, _, img_size = struct.unpack('IIHHI', b[:16])
         version = struct.unpack('BBHI', b[20:28])