diff options
| author | Damien Miller <djm@mindrot.org> | 2010-06-26 02:02:24 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-06-26 02:02:24 +0200 |
| commit | 1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72 (patch) | |
| tree | 708954349afa3ef3f1294934443d5773c1b6b53f /ssh.c | |
| parent | - djm@cvs.openbsd.org 2010/06/25 23:10:30 (diff) | |
| download | openssh-1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72.tar.xz openssh-1ab6a51f9b258a6e844f1ee442c15aec7fcb6a72.zip | |
- djm@cvs.openbsd.org 2010/06/25 23:10:30
[ssh.c]
log the hostname and address that we connected to at LogLevel=verbose
after authentication is successful to mitigate "phishing" attacks by
servers with trusted keys that accept authentication silently and
automatically before presenting fake password/passphrase prompts;
"nice!" markus@
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.339 2010/06/25 23:10:30 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.340 2010/06/25 23:15:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1103,7 +1103,9 @@ ssh_session(void) char *proto, *data; /* Get reasonable local authentication information. */ client_x11_get_proto(display, options.xauth_location, - options.forward_x11_trusted, &proto, &data); + options.forward_x11_trusted, + options.forward_x11_timeout, + &proto, &data); /* Request forwarding with authentication spoofing. */ debug("Requesting X11 forwarding with authentication " "spoofing."); @@ -1199,7 +1201,8 @@ ssh_session2_setup(int id, int success, void *arg) char *proto, *data; /* Get reasonable local authentication information. */ client_x11_get_proto(display, options.xauth_location, - options.forward_x11_trusted, &proto, &data); + options.forward_x11_trusted, + options.forward_x11_timeout, &proto, &data); /* Request forwarding with authentication spoofing. */ debug("Requesting X11 forwarding with authentication " "spoofing."); |