diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-05-31 03:20:07 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-08 00:20:01 +1000 |
commit | c586d2d3129265ea64b12960c379d634bccb6535 (patch) | |
tree | db488c43d6ca149a38d52a281d5924fa782b0699 /sshconnect2.c | |
parent | 410b231aa41ff830b2f5b09b5aaf5e5cdc1ab86b (diff) |
upstream: fix ssh-keysign fd handling problem introduced in r1.304
caused by a typo (STDIN_FILENO vs STDERR_FILENO)
OpenBSD-Commit-ID: 57a0b4be7bef23963afe24150e24bf014fdd9cb0
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index d2b5d4c04..0d2523ca1 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.304 2019/05/15 04:43:31 deraadt Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.305 2019/05/31 03:20:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1886,7 +1886,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, | |||
1886 | } | 1886 | } |
1887 | close(from[1]); | 1887 | close(from[1]); |
1888 | close(to[0]); | 1888 | close(to[0]); |
1889 | sock = STDIN_FILENO + 1; | 1889 | sock = STDERR_FILENO + 1; |
1890 | 1890 | ||
1891 | if ((b = sshbuf_new()) == NULL) | 1891 | if ((b = sshbuf_new()) == NULL) |
1892 | fatal("%s: sshbuf_new failed", __func__); | 1892 | fatal("%s: sshbuf_new failed", __func__); |