lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-01 17:26:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpg: remove extra param from Factory.from_public_key()

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-04 09:53:43 +03:00
parent 171c746c7e
commit 04af6b737b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trezor_agent/gpg/agent.py
View File

@@ -41,8 +41,7 @@ def pksign(keygrip, digest, algo):
assert algo == '8'
pubkey = decode.load_public_key(keyring.export_public_key(user_id=None),
use_custom=True)
f = encode.Factory.from_public_key(pubkey=pubkey,
user_id=pubkey['user_id'])
f = encode.Factory.from_public_key(pubkey=pubkey)
with contextlib.closing(f):
assert f.pubkey.keygrip == binascii.unhexlify(keygrip)
r, s = f.conn.sign(binascii.unhexlify(digest))
@@ -86,8 +85,7 @@ def pkdecrypt(keygrip, conn):
local_pubkey = decode.load_public_key(
pubkey_bytes=keyring.export_public_key(user_id=None),
use_custom=True)
f = encode.Factory.from_public_key(
pubkey=local_pubkey, user_id=local_pubkey['user_id'])
f = encode.Factory.from_public_key(pubkey=local_pubkey)
with contextlib.closing(f):
assert f.pubkey.keygrip == binascii.unhexlify(keygrip)
shared_secret = f.get_shared_secret(remote_pubkey)

7
trezor_agent/gpg/encode.py
View File

@@ -97,13 +97,12 @@ class Factory(object):
self.pubkey, _time_format(self.pubkey.created), user_id)
@classmethod
def from_public_key(cls, pubkey, user_id):
def from_public_key(cls, pubkey):
"""Create from an existing GPG public key."""
is_ecdh = (pubkey['algo'] == proto.ECDH_ALGO_ID)
f = cls(user_id=user_id,
f = cls(user_id=pubkey['user_id'],
created=pubkey['created'],
curve_name=proto.find_curve_by_algo_id(pubkey['algo']),
ecdh=is_ecdh)
ecdh=(pubkey['algo'] == proto.ECDH_ALGO_ID))
assert f.pubkey.key_id() == pubkey['key_id']
return f