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

agent: refactor signature and ECDH

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-11 15:06:35 +03:00
parent 7bbf11b631
commit 16de8cdabc
2 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
trezor_agent/gpg/agent.py
View File

@@ -39,12 +39,13 @@ def sig_encode(r, s):
def pksign(keygrip, digest, algo):
"""Sign a message digest using a private EC key."""
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)
with contextlib.closing(f):
assert f.pubkey.keygrip == binascii.unhexlify(keygrip)
r, s = f.conn.sign(binascii.unhexlify(digest))
pubkey_dict = decode.load_public_key(
pubkey_bytes=keyring.export_public_key(user_id=None),
use_custom=True)
pubkey, conn = encode.load_from_public_key(pubkey_dict=pubkey_dict)
with contextlib.closing(conn):
assert pubkey.keygrip == binascii.unhexlify(keygrip)
r, s = conn.sign(binascii.unhexlify(digest))
result = sig_encode(r, s)
log.debug('result: %r', result)
return result
@@ -85,10 +86,10 @@ 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)
with contextlib.closing(f):
assert f.pubkey.keygrip == binascii.unhexlify(keygrip)
shared_secret = f.get_shared_secret(remote_pubkey)
pubkey, conn = encode.load_from_public_key(pubkey_dict=local_pubkey)
with contextlib.closing(conn):
assert pubkey.keygrip == binascii.unhexlify(keygrip)
shared_secret = conn.ecdh(remote_pubkey)
assert len(shared_secret) == 65
assert shared_secret[:1] == b'\x04'