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

OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3

3 files changed, 9 insertions, 9 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index 5edd0e653..4fd18f467 100644
--- a/auth2-chall.c
+++ b/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.
@@ -280,9 +280,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/auth2-pubkey.c b/auth2-pubkey.c
index e649a6253..c4d0f7908 100644
--- a/auth2-pubkey.c
+++ b/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.
  *
@@ -218,9 +218,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/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
 }