summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>1999-10-14 18:17:41 +0000
committermarkus <markus@openbsd.org>1999-10-14 18:17:41 +0000
commit33fe18e4e13baac3f75c66f28850f53d2c53a20b (patch)
tree984f5334aaa3dcaf7a9f6cac86fdab5377d6fde0 /usr.bin/ssh/ssh.c
parentlibssl*.t*z -> ssl*.t*z (diff)
downloadwireguard-openbsd-33fe18e4e13baac3f75c66f28850f53d2c53a20b.tar.xz
wireguard-openbsd-33fe18e4e13baac3f75c66f28850f53d2c53a20b.zip
fix old connect() race security-bug for ssh-agent and agent-forwarding
by removing the connect() junk, with the following restrictions: 1) change the version to "OpenSSH-1.1": agent-forwarding will work only between OpenSSH-1.1 client and OpenSSH-1.1 server 2) renamed the environment variable of OpenSSH-1.1 to "SSH_AUTH_SOCKET", since useing OpenSSH-1.0 ssh-add against the new ssh-agent does not work
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 9fce3199b8b..163eb8787cf 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -18,7 +18,7 @@ Modified to work with SSL by Niels Provos <provos@citi.umich.edu> in Canada.
*/
#include "includes.h"
-RCSID("$Id: ssh.c,v 1.23 1999/10/12 21:04:22 markus Exp $");
+RCSID("$Id: ssh.c,v 1.24 1999/10/14 18:17:42 markus Exp $");
#include "xmalloc.h"
#include "ssh.h"
@@ -736,7 +736,7 @@ main(int ac, char **av)
packet_set_interactive(interactive, options.keepalives);
/* Clear agent forwarding if we don\'t have an agent. */
- authfd = ssh_get_authentication_fd();
+ authfd = ssh_get_authentication_socket();
if (authfd < 0)
options.forward_agent = 0;
else