From a2e46048a19b24c92c1524cc9fe7136dfb494cb9 Mon Sep 17 00:00:00 2001 From: Jochen Hoenicke Date: Wed, 22 Jun 2016 01:56:37 +0200 Subject: [PATCH] Use TREZOR_GPG_USER_ID in agent --- trezor_agent/gpg/agent.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trezor_agent/gpg/agent.py b/trezor_agent/gpg/agent.py index c3e3156..9011fae 100644 --- a/trezor_agent/gpg/agent.py +++ b/trezor_agent/gpg/agent.py @@ -2,6 +2,7 @@ import binascii import contextlib import logging +import os from . import decode, encode, keyring from .. import util @@ -39,8 +40,9 @@ def sig_encode(r, s): def pksign(keygrip, digest, algo): """Sign a message digest using a private EC key.""" assert algo == '8' + user_id = os.environ['TREZOR_GPG_USER_ID'] pubkey_dict = decode.load_public_key( - pubkey_bytes=keyring.export_public_key(user_id=None), + pubkey_bytes=keyring.export_public_key(user_id=user_id), use_custom=True, ecdh=False) pubkey, conn = encode.load_from_public_key(pubkey_dict=pubkey_dict) with contextlib.closing(conn): @@ -83,8 +85,9 @@ def pkdecrypt(keygrip, conn): assert keyring.recvline(conn) == b'END' remote_pubkey = parse_ecdh(line) + user_id = os.environ['TREZOR_GPG_USER_ID'] local_pubkey = decode.load_public_key( - pubkey_bytes=keyring.export_public_key(user_id=None), + pubkey_bytes=keyring.export_public_key(user_id=user_id), use_custom=True, ecdh=True) pubkey, conn = encode.load_from_public_key(pubkey_dict=local_pubkey) with contextlib.closing(conn):