upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@

OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3

1 files changed, 3 insertions, 3 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 9874b4485..fb90e8afc 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
 }