diff options
| author |   djm <djm@openbsd.org> | 2020-09-18 08:16:38 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-09-18 08:16:38 +0000 |
| commit | 453bd449dc499df787a5600ecd1c3baa6dbd2509 (patch) | |
| tree | 6216eaa85cfd0a924395ba1db5fb9b3d87b7c17f /usr.bin/ssh/ssh-agent.c | |
| parent | tweak the client hostkey preference ordering algorithm to prefer the (diff) | |
| download | wireguard-openbsd-453bd449dc499df787a5600ecd1c3baa6dbd2509.tar.xz wireguard-openbsd-453bd449dc499df787a5600ecd1c3baa6dbd2509.zip | |
handle multiple messages in a single read()
PR#183 by Dennis Kaarsemaker; feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 8572fa09df2..db42ea47160 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -838,8 +838,10 @@ send: } #endif /* ENABLE_PKCS11 */ -/* dispatch incoming messages */ - +/* + * dispatch incoming message. + * returns 1 on success, 0 for incomplete messages or -1 on error. + */ static int process_message(u_int socknum) { @@ -893,7 +895,7 @@ process_message(u_int socknum) /* send a fail message for all other request types */ send_status(e, 0); } - return 0; + return 1; } switch (type) { @@ -937,7 +939,7 @@ process_message(u_int socknum) send_status(e, 0); break; } - return 0; + return 1; } static void @@ -1028,7 +1030,12 @@ handle_conn_read(u_int socknum) if ((r = sshbuf_put(sockets[socknum].input, buf, len)) != 0) fatal("%s: buffer error: %s", __func__, ssh_err(r)); explicit_bzero(buf, sizeof(buf)); - process_message(socknum); + for (;;) { + if ((r = process_message(socknum)) == -1) + return -1; + else if (r == 0) + break; + } return 0; } |