summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-11 18:55:11 +0000
committerDamien Miller <djm@mindrot.org>2018-07-12 13:18:25 +1000
commit394a842e60674bf8ee5130b9f15b01452a0b0285 (patch)
treeefc4184c84cdc47de1d8b9c77ab22359e8160a97 /sshconnect2.c
parent5467fbcb09528ecdcb914f4f2452216c24796790 (diff)
upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 9874b448..fb90e8af 100644
--- a/sshconnect2.c
+++ b/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.
@@ -234,9 +234,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
}