commit e955510d135d0827d9087cb130175443997d1a8e
author Marek Pieta <Marek.Pieta@nordicsemi.no> Thu Aug 08 16:08:16 2019 +0200
committer Fabio Utzig <utzig@utzig.org> Thu Aug 08 12:00:21 2019 -0300
tree 464cc74b2a3fe2f3cb538b74239bd2112fed0279
parent 8000e325f1d7be02cacdd9593f4282a2d944c2b1

scripts: Show image version while verifying

Change adds showing image version while verifying.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>

scripts/imgtool/image.py

diff --git a/scripts/imgtool/image.py b/scripts/imgtool/image.py
index 251aa9a..6701a5b 100644
--- a/scripts/imgtool/image.py
+++ b/scripts/imgtool/image.py
@@ -331,13 +331,15 @@
             b = f.read()
 
         magic, _, header_size, _, img_size = struct.unpack('IIHHI', b[:16])
+        version = struct.unpack('BBHI', b[20:28])
+
         if magic != IMAGE_MAGIC:
-            return VerifyResult.INVALID_MAGIC
+            return VerifyResult.INVALID_MAGIC, None
 
         tlv_info = b[header_size+img_size:header_size+img_size+TLV_INFO_SIZE]
         magic, tlv_tot = struct.unpack('HH', tlv_info)
         if magic != TLV_INFO_MAGIC:
-            return VerifyResult.INVALID_TLV_INFO_MAGIC
+            return VerifyResult.INVALID_TLV_INFO_MAGIC, None
 
         sha = hashlib.sha256()
         sha.update(b[:header_size+img_size])
@@ -353,9 +355,9 @@
                 off = tlv_off + TLV_SIZE
                 if digest == b[off:off+tlv_len]:
                     if key is None:
-                        return VerifyResult.OK
+                        return VerifyResult.OK, version
                 else:
-                    return VerifyResult.INVALID_HASH
+                    return VerifyResult.INVALID_HASH, None
             elif key is not None and tlv_type == TLV_VALUES[key.sig_tlv()]:
                 off = tlv_off + TLV_SIZE
                 tlv_sig = b[off:off+tlv_len]
@@ -365,9 +367,9 @@
                         key.verify(tlv_sig, payload)
                     else:
                         key.verify_digest(tlv_sig, digest)
-                    return VerifyResult.OK
+                    return VerifyResult.OK, version
                 except InvalidSignature:
                     # continue to next TLV
                     pass
             tlv_off += TLV_SIZE + tlv_len
-        return VerifyResult.INVALID_SIGNATURE
+        return VerifyResult.INVALID_SIGNATURE, None