jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #384 from yanchenko-igor/master

Browse Source 
Handle usupported extensions, fixes #383 fixes #379
This commit is contained in:
Roman Zeyde
2022-03-27 22:53:25 +03:00
committed by GitHub
parent df84c4c15f a8f2d74d02
commit 1166917461
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libagent/ssh/protocol.py
View File

@@ -40,6 +40,8 @@ COMMANDS = dict(
SSH_AGENTC_ADD_RSA_ID_CONSTRAINED=24, SSH_AGENTC_ADD_RSA_ID_CONSTRAINED=24,
SSH2_AGENTC_ADD_ID_CONSTRAINED=25, SSH2_AGENTC_ADD_ID_CONSTRAINED=25,
SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED=26, SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED=26,
SSH_AGENTC_EXTENSION=27,
SSH_AGENT_EXTENSION_FAILURE=28,
) )
@@ -86,6 +88,7 @@ class Handler:
msg_code('SSH_AGENTC_REQUEST_RSA_IDENTITIES'): _legacy_pubs, msg_code('SSH_AGENTC_REQUEST_RSA_IDENTITIES'): _legacy_pubs,
msg_code('SSH2_AGENTC_REQUEST_IDENTITIES'): self.list_pubs, msg_code('SSH2_AGENTC_REQUEST_IDENTITIES'): self.list_pubs,
msg_code('SSH2_AGENTC_SIGN_REQUEST'): self.sign_message, msg_code('SSH2_AGENTC_SIGN_REQUEST'): self.sign_message,
msg_code('SSH_AGENTC_EXTENSION'): self.unsupported_extension,
} }
def handle(self, msg): def handle(self, msg):
@@ -162,3 +165,7 @@ class Handler:
data = util.frame(util.frame(key['type']), util.frame(sig_bytes)) data = util.frame(util.frame(key['type']), util.frame(sig_bytes))
code = util.pack('B', msg_code('SSH2_AGENT_SIGN_RESPONSE')) code = util.pack('B', msg_code('SSH2_AGENT_SIGN_RESPONSE'))
return util.frame(code, data) return util.frame(code, data)
def unsupported_extension(self, buf):
code = util.pack('B', msg_code('SSH_AGENT_EXTENSION_FAILURE'))
return util.frame(code)