From 4fac8d7705a30db4e656f2d89e7f4d94584fdd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Mas=C3=A1r?= <86710737+fmasar@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:30:49 +0200 Subject: [PATCH] Fixed str and int concat in key loading exceptions --- scripts/imgtool/keys/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/imgtool/keys/__init__.py b/scripts/imgtool/keys/__init__.py index ed2fed57e9..9e4b1826ee 100644 --- a/scripts/imgtool/keys/__init__.py +++ b/scripts/imgtool/keys/__init__.py @@ -69,17 +69,17 @@ def load(path, passwd=None): if isinstance(pk, RSAPrivateKey): if pk.key_size not in RSA_KEY_SIZES: - raise Exception("Unsupported RSA key size: " + pk.key_size) + raise Exception("Unsupported RSA key size: " + str(pk.key_size)) return RSA(pk) elif isinstance(pk, RSAPublicKey): if pk.key_size not in RSA_KEY_SIZES: - raise Exception("Unsupported RSA key size: " + pk.key_size) + raise Exception("Unsupported RSA key size: " + str(pk.key_size)) return RSAPublic(pk) elif isinstance(pk, EllipticCurvePrivateKey): if pk.curve.name not in ('secp256r1', 'secp384r1'): raise Exception("Unsupported EC curve: " + pk.curve.name) if pk.key_size not in (256, 384): - raise Exception("Unsupported EC size: " + pk.key_size) + raise Exception("Unsupported EC size: " + str(pk.key_size)) if pk.curve.name == 'secp256r1': return ECDSA256P1(pk) elif pk.curve.name == 'secp384r1': @@ -88,7 +88,7 @@ def load(path, passwd=None): if pk.curve.name not in ('secp256r1', 'secp384r1'): raise Exception("Unsupported EC curve: " + pk.curve.name) if pk.key_size not in (256, 384): - raise Exception("Unsupported EC size: " + pk.key_size) + raise Exception("Unsupported EC size: " + str(pk.key_size)) if pk.curve.name == 'secp256r1': return ECDSA256P1Public(pk) elif pk.curve.name == 'secp384r1':