Commit 018b7703 authored by Roland Mikhel's avatar Roland Mikhel Committed by Dávid Vincze
Browse files

imgtool: Fix getpriv error return with private key



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

Signed-off-by: default avatarRoland Mikhel <roland.mikhel@arm.com>
Change-Id: I66c1365a855e97199921ac136a18e26988bce508
parent 9fad4c1f
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -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.
    """