commit 018b77032c436371b014c0c829acc3e5395ca7f3
author Roland Mikhel <roland.mikhel@arm.com> Mon Jul 17 15:12:18 2023 +0200
committer Dávid Vincze <david.vincze@arm.com> Mon Jul 24 09:33:50 2023 +0200
tree 0fb5380e47ce77d764f2a9dc02257a1307759d1b
parent 9fad4c1f1641d8162b73e8c0beaeae8d9c856b4f

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

scripts/imgtool/keys/ecdsa.py

diff --git a/scripts/imgtool/keys/ecdsa.py b/scripts/imgtool/keys/ecdsa.py
index b70153c..52357b1 100644
--- a/scripts/imgtool/keys/ecdsa.py
+++ b/scripts/imgtool/keys/ecdsa.py
@@ -30,7 +30,7 @@
         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 @@
     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 @@
                         signature_algorithm=ec.ECDSA(SHA256()))
 
 
-class ECDSA256P1(ECDSA256P1Public, ECDSAPrivateKey):
+class ECDSA256P1(ECDSAPrivateKey, ECDSA256P1Public):
     """
     Wrapper around an ECDSA (p256) private key.
     """
@@ -252,7 +255,7 @@
                         signature_algorithm=ec.ECDSA(SHA384()))
 
 
-class ECDSA384P1(ECDSA384P1Public, ECDSAPrivateKey):
+class ECDSA384P1(ECDSAPrivateKey, ECDSA384P1Public):
     """
     Wrapper around an ECDSA (p384) private key.
     """