From 3c9c1b4e14ed96ea9045e432f275b13debdf5719 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Thu, 28 Apr 2016 14:44:52 +0300 Subject: [PATCH] gpg: export verifying_key from parsing --- trezor_agent/gpg/decode.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trezor_agent/gpg/decode.py b/trezor_agent/gpg/decode.py index 9334646..d57bd2c 100644 --- a/trezor_agent/gpg/decode.py +++ b/trezor_agent/gpg/decode.py @@ -52,7 +52,7 @@ def _parse_nist256p1_verifier(mpi): digest=digest, sigdecode=lambda rs, order: rs) log.debug('nist256p1 ECDSA signature is OK (%s)', result) - return _nist256p1_verify + return _nist256p1_verify, vk def _parse_ed25519_verifier(mpi): @@ -65,7 +65,7 @@ def _parse_ed25519_verifier(mpi): for val in signature) result = vk.verify(sig, digest) log.debug('ed25519 ECDSA signature is OK (%s)', result) - return _ed25519_verify + return _ed25519_verify, vk SUPPORTED_CURVES = { @@ -140,7 +140,7 @@ def _parse_pubkey(stream): mpi = parse_mpi(stream) log.debug('mpi: %x (%d bits)', mpi, mpi.bit_length()) - p['verifier'] = parser(mpi) + p['verifier'], p['verifying_key'] = parser(mpi) assert not stream.read() # https://tools.ietf.org/html/rfc4880#section-12.2 @@ -170,7 +170,7 @@ def _parse_subkey(stream): mpi = parse_mpi(stream) log.debug('mpi: %x (%d bits)', mpi, mpi.bit_length()) - p['verifier'] = parser(mpi) + p['verifier'], p['verifying_key'] = parser(mpi) leftover = stream.read() # TBD: what is this? if leftover: log.warning('unexpected subkey leftover: %r', leftover)