OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

imgtool: Fix getpriv error return with private key 

This commit fixes a bug with the getpriv command using
ECDSA keys.

Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
Change-Id: I66c1365a855e97199921ac136a18e26988bce508
This commit is contained in:
Roland Mikhel 2023-07-17 15:12:18 +02:00 committed by Dávid Vincze
parent 9fad4c1f16
commit 018b77032c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/imgtool/keys/ecdsa.py
View File

@ -30,7 +30,7 @@ class ECDSAPublicKey(KeyClass):
raise ECDSAUsageError("Operation {} requires private key".format(name))
def _get_public(self):
return self.key.public_key()
return self.key
def get_public_bytes(self):
# The key is embedded into MBUboot in "SubjectPublicKeyInfo" format
@ -65,6 +65,9 @@ class ECDSAPrivateKey(PrivateBytesMixin):
def __init__(self, key):
self.key = key
def _get_public(self):
return self.key.public_key()
def _build_minimal_ecdsa_privkey(self, der, format):
'''
Builds a new DER that only includes the EC private key, removing the
@ -179,7 +182,7 @@ class ECDSA256P1Public(ECDSAPublicKey):
signature_algorithm=ec.ECDSA(SHA256()))
class ECDSA256P1(ECDSA256P1Public, ECDSAPrivateKey):
class ECDSA256P1(ECDSAPrivateKey, ECDSA256P1Public):
"""
Wrapper around an ECDSA (p256) private key.
"""
@ -252,7 +255,7 @@ class ECDSA384P1Public(ECDSAPublicKey):
signature_algorithm=ec.ECDSA(SHA384()))
class ECDSA384P1(ECDSA384P1Public, ECDSAPrivateKey):
class ECDSA384P1(ECDSAPrivateKey, ECDSA384P1Public):
"""
Wrapper around an ECDSA (p384) private key.
"""