[nrf fromlist] scipts: imgtool: bugfix #2096

michalek-no · jukkar · commit be4b51ca67fe · 2024-12-05T09:26:18.000+02:00
fixing broken encryption caused by shift in function parameters. Upstream PR: mcu-tools/mcuboot#2098 Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no> (cherry picked from commit 31f74eb) (cherry picked from commit 2b568d8)
diff --git a/scripts/imgtool/main.py b/scripts/imgtool/main.py
@@ -510,7 +510,7 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,
         }
 
     img.create(key, public_key_format, enckey, dependencies, boot_record,
-               custom_tlvs, compression_tlvs, int(encrypt_keylen), clear,
+               custom_tlvs, compression_tlvs, None, int(encrypt_keylen), clear,
                baked_signature, pub_key, vector_to_sign, user_sha)
 
     if compression in ["lzma2", "lzma2armthumb"]:

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`img.create(key, public_key_format, enckey, dependencies, boot_record,`
`513`		`- custom_tlvs, compression_tlvs, int(encrypt_keylen), clear,`
	`513`	`+ custom_tlvs, compression_tlvs, None, int(encrypt_keylen), clear,`
`514`	`514`	`baked_signature, pub_key, vector_to_sign, user_sha)`
`515`	`515`
`516`	`516`	`if compression in ["lzma2", "lzma2armthumb"]:`