diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2015-01-19 20:16:16 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2015-01-19 20:16:16 +0000 |
| commit | 002124f10b6efe41acf62100a28f8d9fad5cafa1 (patch) | |
| tree | 68c430a276ba8885606f7fe642ac62ddb1e7222d /usr.bin/ssh/clientloop.c | |
| parent | 42d3f66770b2d25d3ec4b397e2b3fd37cdb1740b (diff) | |
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'usr.bin/ssh/clientloop.c')
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 58be15ec425..0d5844cc21f 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.264 2015/01/19 20:07:45 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.265 2015/01/19 20:16:15 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1401,8 +1401,7 @@ client_process_output(fd_set *writeset) static void client_process_buffered_input_packets(void) { - dispatch_run(DISPATCH_NONBLOCK, &quit_pending, - compat20 ? active_state->kex : NULL); + dispatch_run(DISPATCH_NONBLOCK, &quit_pending, active_state); } /* scan buf[] for '~' before sending data to the peer */ @@ -1456,7 +1455,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) { fd_set *readset = NULL, *writeset = NULL; double start_time, total_time; - int max_fd = 0, max_fd2 = 0, len, rekeying = 0; + int r, max_fd = 0, max_fd2 = 0, len, rekeying = 0; u_int64_t ibytes, obytes; u_int nalloc = 0; char buf[100]; @@ -1586,7 +1585,9 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) if (need_rekeying || packet_need_rekeying()) { debug("need rekeying"); active_state->kex->done = 0; - kex_send_kexinit(active_state->kex); + if ((r = kex_send_kexinit(active_state)) != 0) + fatal("%s: kex_send_kexinit: %s", + __func__, ssh_err(r)); need_rekeying = 0; } } |