lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-04-21 05:36:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow contents in buffer when using _legacy_pubs

Browse Source
This commit is contained in:
Nubis
2017-03-07 23:45:05 -03:00
committed by Roman Zeyde
parent 6a7165298f
commit 9a271d115b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trezor_agent/protocol.py
View File

@@ -62,7 +62,9 @@ def failure():
def _legacy_pubs(buf): def _legacy_pubs(buf):
"""SSH v1 public keys are not supported.""" """SSH v1 public keys are not supported."""
assert not buf.read() leftover = buf.read()
if leftover:
log.warning('skipping leftover: %r', leftover)
code = util.pack('B', msg_code('SSH_AGENT_RSA_IDENTITIES_ANSWER')) code = util.pack('B', msg_code('SSH_AGENT_RSA_IDENTITIES_ANSWER'))
num = util.pack('L', 0) # no SSH v1 keys num = util.pack('L', 0) # no SSH v1 keys
return util.frame(code, num) return util.frame(code, num)

7
trezor_agent/tests/test_protocol.py
View File

@@ -31,6 +31,13 @@ def test_list():
assert reply == LIST_NIST256_REPLY assert reply == LIST_NIST256_REPLY
def test_list_legacy_pubs_with_suffix():
h = protocol.Handler(fake_connection(keys=[], signer=None))
suffix = b'\x00\x00\x00\x06foobar'
reply = h.handle(b'\x01' + suffix)
assert reply == b'\x00\x00\x00\x05\x02\x00\x00\x00\x00' # no legacy keys
def test_unsupported(): def test_unsupported():
h = protocol.Handler(fake_connection(keys=[], signer=None)) h = protocol.Handler(fake_connection(keys=[], signer=None))
reply = h.handle(b'\x09') reply = h.handle(b'\x09')