diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-10-15 08:00:47 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-10-15 08:00:47 +0200 |
| commit | dda19d63ffeed569c57f4b9359bc358abe690d23 (patch) | |
| tree | 8964645e7f49888c29131aa8d28913e84e1d29d2 /sshconnect.c | |
| parent | - markus@cvs.openbsd.org 2003/10/13 08:22:25 (diff) | |
| download | openssh-dda19d63ffeed569c57f4b9359bc358abe690d23.tar.xz openssh-dda19d63ffeed569c57f4b9359bc358abe690d23.zip | |
- jakob@cvs.openbsd.org 2003/10/14 19:42:10
[dns.c dns.h readconf.c ssh-keygen.c sshconnect.c]
include SSHFP lookup code (not enabled by default). ok markus@
Diffstat (limited to '')
| -rw-r--r-- | sshconnect.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sshconnect.c b/sshconnect.c index f29ac8088..2c028f3a6 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.148 2003/09/18 07:52:54 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.149 2003/10/14 19:42:10 jakob Exp $"); #include <openssl/bn.h> @@ -33,16 +33,12 @@ RCSID("$OpenBSD: sshconnect.c,v 1.148 2003/09/18 07:52:54 markus Exp $"); #include "misc.h" #include "readpass.h" -#ifdef DNS #include "dns.h" -#endif char *client_version_string = NULL; char *server_version_string = NULL; -#ifdef DNS int verified_host_key_dns = 0; -#endif /* import */ extern Options options; @@ -730,7 +726,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, /* The default */ fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); msg2[0] = '\0'; -#ifdef DNS if (options.verify_host_key_dns) { if (verified_host_key_dns) snprintf(msg2, sizeof(msg2), @@ -741,7 +736,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, "No matching host key fingerprint" " found in DNS.\n"); } -#endif snprintf(msg, sizeof(msg), "The authenticity of host '%.200s (%s)' can't be " "established%s\n" @@ -908,7 +902,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) { struct stat st; -#ifdef DNS if (options.verify_host_key_dns) { switch(verify_host_key_dns(host, hostaddr, host_key)) { case DNS_VERIFY_OK: @@ -927,7 +920,6 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) break; } } -#endif /* DNS */ /* return ok if the key can be found in an old keyfile */ if (stat(options.system_hostfile2, &st) == 0 || |