commit bf5b98c63820616d6d56e68388ec00602af4344f
author Kevin Townsend <kevin.townsend@linaro.org> Tue Jun 02 12:23:57 2020 +0200
committer Tamas Ban <tamas.ban@arm.com> Thu Jun 04 11:22:32 2020 +0000
tree eba34e6aeb51ff5e78ec666e9f43427170641ad1
parent 99c0a9626df6ed0d62d37e0493c7067254d99e7e

Boot: Add byte cast when signing payload

This commit adds an explicit cast to `bytes` for the payload
when signing data with imgtool. On some systems, the data may be
provided as a `ByteArray`, which will cause the signing function
to fail since the underlying library expects `bytes`.

Signed-off-by: Kevin Townsend <kevin.townsend@linaro.org>
Change-Id: I7405d9e76570d61cc745dcd81e6033dec637d2f3

bl2/ext/mcuboot/scripts/imgtool_lib/keys.py

diff --git a/bl2/ext/mcuboot/scripts/imgtool_lib/keys.py b/bl2/ext/mcuboot/scripts/imgtool_lib/keys.py
index 7ee9671..1f6ef90 100644
--- a/bl2/ext/mcuboot/scripts/imgtool_lib/keys.py
+++ b/bl2/ext/mcuboot/scripts/imgtool_lib/keys.py
@@ -106,7 +106,7 @@
     def sign(self, payload):
         if sign_rsa_pss:
             signature = self.key.sign(
-                data=payload,
+                data=bytes(payload),
                 padding=PSS(
                     mgf=MGF1(SHA256()),
                     salt_length=32
@@ -115,7 +115,7 @@
             )
         else:
             signature = self.key.sign(
-                data=payload,
+                data=bytes(payload),
                 padding=PKCS1v15(),
                 algorithm=SHA256()
             )