summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-05-31 03:20:07 +0000
committerdjm <djm@openbsd.org>2019-05-31 03:20:07 +0000
commit2fcfb473f30cca61852118478c75e55d293c7c59 (patch)
tree54e241dce34e39b633cd032dc111a4d36fdff609 /usr.bin/ssh/sshconnect2.c
parentUse two 32-bit writes instead of a single 64-bit write to write the (diff)
downloadwireguard-openbsd-2fcfb473f30cca61852118478c75e55d293c7c59.tar.xz
wireguard-openbsd-2fcfb473f30cca61852118478c75e55d293c7c59.zip
fix ssh-keysign fd handling problem introduced in r1.304 caused by a typo
(STDIN_FILENO vs STDERR_FILENO)
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index f28d9485a4a..123fb6c2818 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.304 2019/05/15 04:43:31 deraadt Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.305 2019/05/31 03:20:07 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1878,7 +1878,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
}
close(from[1]);
close(to[0]);
- sock = STDIN_FILENO + 1;
+ sock = STDERR_FILENO + 1;
if ((b = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new failed", __func__);