tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: handle multiple messages in a single read() 

PR#183 by Dennis Kaarsemaker; feedback and ok markus@

OpenBSD-Commit-ID: 8570bb4d02d00cf70b98590716ea6a7d1cce68d1
This commit is contained in:
djm@openbsd.org 2020-09-18 08:16:38 +00:00 committed by Damien Miller
parent dc098405b2
commit 52a03e9fca
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.263 2020/08/27 01:06:18 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.264 2020/09/18 08:16:38 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -852,8 +852,10 @@ send:
} }
#endif /* ENABLE_PKCS11 */ #endif /* ENABLE_PKCS11 */
/* dispatch incoming messages */ /*
* dispatch incoming message.
* returns 1 on success, 0 for incomplete messages or -1 on error.
*/
static int static int
process_message(u_int socknum) process_message(u_int socknum)
{ {
@ -907,7 +909,7 @@ process_message(u_int socknum)
/* send a fail message for all other request types */ /* send a fail message for all other request types */
send_status(e, 0); send_status(e, 0);
} }
return 0; return 1;
} }
switch (type) { switch (type) {
@ -951,7 +953,7 @@ process_message(u_int socknum)
send_status(e, 0); send_status(e, 0);
break; break;
} }
return 0; return 1;
} }
static void static void
@ -1042,7 +1044,12 @@ handle_conn_read(u_int socknum)
if ((r = sshbuf_put(sockets[socknum].input, buf, len)) != 0) if ((r = sshbuf_put(sockets[socknum].input, buf, len)) != 0)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
explicit_bzero(buf, sizeof(buf)); explicit_bzero(buf, sizeof(buf));
process_message(socknum); for (;;) {
if ((r = process_message(socknum)) == -1)
return -1;
else if (r == 0)
break;
}
return 0; return 0;
} }