summaryrefslogtreecommitdiffstats
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-11 20:55:11 +0200
committerDamien Miller <djm@mindrot.org>2018-07-12 05:18:25 +0200
commit394a842e60674bf8ee5130b9f15b01452a0b0285 (patch)
treeefc4184c84cdc47de1d8b9c77ab22359e8160a97 /auth2-pubkey.c
parentupstream: remove legacy key emulation layer; ok djm@ (diff)
downloadopenssh-394a842e60674bf8ee5130b9f15b01452a0b0285.tar.xz
openssh-394a842e60674bf8ee5130b9f15b01452a0b0285.zip
upstream: treat ssh_packet_write_wait() errors as fatal; ok djm@
OpenBSD-Commit-ID: f88ba43c9d54ed2d911218aa8d3f6285430629c3
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r--auth2-pubkey.c6
1 files changed, 3 insertions, 3 deletions
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;
}
}