diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:37:41 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:37:41 +0000 |
| commit | d6481ea49ab5999e00cc2a2fd7b6a1d779f4c598 (patch) | |
| tree | c89fd81312f3b95fe22bcaad56cdb1b2a2dd822a /sshconnect1.c | |
| parent | b710f788f173a80a9a24fa041558087b56bb7fac (diff) | |
- markus@cvs.openbsd.org 2001/06/23 02:34:33
[kexdh.c kexgex.c kex.h pathnames.h readconf.c servconf.h ssh.1
sshconnect1.c sshconnect2.c sshconnect.c sshconnect.h sshd.8]
get rid of known_hosts2, use it for hostkey lookup, but do not
modify.
Diffstat (limited to 'sshconnect1.c')
| -rw-r--r-- | sshconnect1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect1.c b/sshconnect1.c index c20613571..4c469c20d 100644 --- a/sshconnect1.c +++ b/sshconnect1.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect1.c,v 1.33 2001/06/07 20:23:05 markus Exp $"); +RCSID("$OpenBSD: sshconnect1.c,v 1.34 2001/06/23 02:34:32 markus Exp $"); #include <openssl/bn.h> #include <openssl/evp.h> @@ -784,8 +784,8 @@ ssh_kex(char *host, struct sockaddr *hostaddr) SSH_SMSG_PUBLIC_KEY); k.type = KEY_RSA1; k.rsa = host_key; - check_host_key(host, hostaddr, &k, - options.user_hostfile, options.system_hostfile); + if (verify_host_key(host, hostaddr, &k) == -1) + fatal("host_key verification failed"); client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN; |