diff options
| author |   markus <markus@openbsd.org> | 2018-07-11 18:55:11 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2018-07-11 18:55:11 +0000 |
| commit | 6e1548f087f1d464bf54b2c5a373c7d831dda143 (patch) | |
| tree | d6b8641c9dc63e4915d74baa106fc2f8eb88739b | |
| parent | remove legacy key emulation layer; ok djm@ (diff) | |
| download | wireguard-openbsd-6e1548f087f1d464bf54b2c5a373c7d831dda143.tar.xz wireguard-openbsd-6e1548f087f1d464bf54b2c5a373c7d831dda143.zip | |
treat ssh_packet_write_wait() errors as fatal; ok djm@
| -rw-r--r-- | usr.bin/ssh/auth2-chall.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/auth2-pubkey.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/ssh/auth2-chall.c b/usr.bin/ssh/auth2-chall.c index 9e91ee2b39b..3941726e574 100644 --- a/usr.bin/ssh/auth2-chall.c +++ b/usr.bin/ssh/auth2-chall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-chall.c,v 1.49 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.50 2018/07/11 18:55:11 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -234,9 +234,9 @@ send_userauth_info_request(struct ssh *ssh) (r = sshpkt_put_u8(ssh, echo_on[i])) != 0) fatal("%s: %s", __func__, ssh_err(r)); } - if ((r = sshpkt_send(ssh)) != 0) + if ((r = sshpkt_send(ssh)) != 0 || + (r = ssh_packet_write_wait(ssh)) != 0) fatal("%s: %s", __func__, ssh_err(r)); - ssh_packet_write_wait(ssh); for (i = 0; i < kbdintctxt->nreq; i++) free(prompts[i]); diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c index ad2b6688480..195da5e2111 100644 --- a/usr.bin/ssh/auth2-pubkey.c +++ b/usr.bin/ssh/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.81 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.82 2018/07/11 18:55:11 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -215,9 +215,9 @@ userauth_pubkey(struct ssh *ssh) != 0 || (r = sshpkt_put_cstring(ssh, pkalg)) != 0 || (r = sshpkt_put_string(ssh, pkblob, blen)) != 0 || - (r = sshpkt_send(ssh)) != 0) + (r = sshpkt_send(ssh)) != 0 || + (r = ssh_packet_write_wait(ssh)) != 0) fatal("%s: %s", __func__, ssh_err(r)); - ssh_packet_write_wait(ssh); authctxt->postponed = 1; } } diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index ddf5700c5ef..c7906afb9e9 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.279 2018/07/11 18:53:29 markus Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.280 2018/07/11 18:55:11 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -226,9 +226,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) /* send 1st encrypted/maced/compressed message */ if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 || (r = sshpkt_put_cstring(ssh, "markus")) != 0 || - (r = sshpkt_send(ssh)) != 0) + (r = sshpkt_send(ssh)) != 0 || + (r = ssh_packet_write_wait(ssh)) != 0) fatal("%s: %s", __func__, ssh_err(r)); - ssh_packet_write_wait(ssh); #endif } |