lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-03-06 23:05:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

HACK: better logging

Browse Source
This commit is contained in:
Roman Zeyde
2016-06-01 18:34:22 +03:00
parent 92649b290f
commit f89c5bb125
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trezor_agent/gpg/agent.py
View File

@@ -31,7 +31,7 @@ def sig_encode(r, s):
"""Serialize ECDSA signature data into GPG S-expression."""
r = serialize(util.num2bytes(r, 32))
s = serialize(util.num2bytes(s, 32))
return '(7:sig-val(5:ecdsa(1:r32:{})(1:s32:{})))\n'.format(r, s)
return '(7:sig-val(5:ecdsa(1:r32:{})(1:s32:{})))'.format(r, s)
def pksign(keygrip, digest, algo):
@@ -55,7 +55,7 @@ def handle_connection(conn):
digest = None
algo = None
conn.sendall('OK\n')
keyring.sendline(conn, b'OK')
while True:
line = keyring.recvline(conn)
parts = line.split(' ')
@@ -64,21 +64,21 @@ def handle_connection(conn):
if command in {'RESET', 'OPTION', 'HAVEKEY', 'SETKEYDESC'}:
pass # reply with OK
elif command == 'GETINFO':
conn.sendall('D 2.1.11\n')
keyring.sendline(conn, b'D 2.1.11')
elif command == 'AGENT_ID':
conn.sendall('D TREZOR\n')
keyring.sendline(conn, b'D TREZOR')
elif command == 'SIGKEY':
keygrip, = args
elif command == 'SETHASH':
algo, digest = args
elif command == 'PKSIGN':
sig = pksign(keygrip, digest, algo)
conn.sendall('D ' + sig)
keyring.sendline(conn, b'D ' + sig)
else:
log.error('unknown request: %r', line)
return
conn.sendall('OK\n')
keyring.sendline(conn, b'OK')
def main():

11
trezor_agent/gpg/keyring.py
View File

@@ -25,11 +25,16 @@ def connect_to_agent(sock_path='~/.gnupg/S.gpg-agent', sp=subprocess):
def communicate(sock, msg):
"""Send a message and receive a single line."""
msg += '\n'
sock.sendall(msg.encode('ascii'))
log.debug('-> %r', msg)
sendline(sock, msg.encode('ascii'))
return recvline(sock)
def sendline(sock, msg):
"""Send a binary message, followed by EOL."""
log.debug('<- %r', msg)
sock.sendall(msg + b'\n')
def recvline(sock):
"""Receive a single line from the socket."""
reply = io.BytesIO()
@@ -43,7 +48,7 @@ def recvline(sock):
reply.write(c)
result = reply.getvalue()
log.debug('<- %r', result)
log.debug('-> %r', result)
return result