diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 20:51:04 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 20:51:04 +0000 |
| commit | cec2ea8d020bc2fe0ee6de1a6cf0230b529ce05c (patch) | |
| tree | 94a1cd284aea3b8dec4c05660705cc070248e4e7 /sshconnect2.c | |
| parent | f088f4374a04f9abd1dc91cb387f75e3bf0c5c56 (diff) | |
| download | openssh-git-cec2ea8d020bc2fe0ee6de1a6cf0230b529ce05c.tar.gz | |
- markus@cvs.openbsd.org 2002/05/31 10:30:33
[sshconnect2.c]
extent ssh-keysign protocol:
pass # of socket-fd to ssh-keysign, keysign verfies locally used
ip-address using this socket-fd, restricts fake local hostnames
to actual local hostnames; ok stevesk@
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 3a0eb761..6950c5ee 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.102 2002/05/25 08:50:39 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.103 2002/05/31 10:30:33 markus Exp $"); #include "ssh.h" #include "ssh2.h" @@ -902,7 +902,7 @@ ssh_keysign( Buffer b; struct stat st; pid_t pid; - int to[2], from[2], status, version = 1; + int to[2], from[2], status, version = 2; debug("ssh_keysign called"); @@ -933,6 +933,8 @@ ssh_keysign( close(to[1]); if (dup2(to[0], STDIN_FILENO) < 0) fatal("ssh_keysign: dup2: %s", strerror(errno)); + close(from[1]); + close(to[0]); execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0); fatal("ssh_keysign: exec(%s): %s", _PATH_SSH_KEY_SIGN, strerror(errno)); @@ -941,6 +943,7 @@ ssh_keysign( close(to[0]); buffer_init(&b); + buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */ buffer_put_string(&b, data, datalen); msg_send(to[1], version, &b); @@ -952,9 +955,9 @@ ssh_keysign( close(from[0]); close(to[1]); - while (waitpid(pid, &status, 0) < 0) - if (errno != EINTR) - break; + while (waitpid(pid, &status, 0) < 0) + if (errno != EINTR) + break; if (buffer_get_char(&b) != version) { error("ssh_keysign: bad version"); |