From efdb9fcfb589f98a9e74b4a9125b251f8473203e Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 28 Oct 2016 22:34:59 +0300 Subject: [PATCH] gpg: fix bytes/str issue with GPG user ID --- trezor_agent/device/interface.py | 1 + trezor_agent/gpg/agent.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trezor_agent/device/interface.py b/trezor_agent/device/interface.py index 52bec1a..5baa21e 100644 --- a/trezor_agent/device/interface.py +++ b/trezor_agent/device/interface.py @@ -41,6 +41,7 @@ def identity_to_string(identity_dict): result.append(':' + identity_dict['port']) if identity_dict.get('path'): result.append(identity_dict['path']) + log.debug('identity parts: %s', result) return ''.join(result) diff --git a/trezor_agent/gpg/agent.py b/trezor_agent/gpg/agent.py index 24ac3ff..575f8d2 100644 --- a/trezor_agent/gpg/agent.py +++ b/trezor_agent/gpg/agent.py @@ -47,7 +47,7 @@ def open_connection(keygrip_bytes): pubkey_bytes=keyring.export_public_keys(), keygrip=keygrip_bytes) # We assume the first user ID is used to generate TREZOR-based GPG keys. - user_id = user_ids[0]['value'] + user_id = user_ids[0]['value'].decode('ascii') curve_name = protocol.get_curve_name_by_oid(pubkey_dict['curve_oid']) ecdh = (pubkey_dict['algo'] == protocol.ECDH_ALGO_ID)