- stevesk@cvs.openbsd.org 2002/08/08 23:54:52

[openssh.git] / sshconnect.c

diff --git a/sshconnect.c b/sshconnect.c
index 9b4c38835a677dfae38905eb609434b38afbfdde..6004bf5e41db05b29495545f156c406fca280203 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.125 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.133 2002/07/29 18:57:30 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -46,16 +46,7 @@ extern uid_t original_effective_uid;
 #define INET6_ADDRSTRLEN 46
 #endif
 
-static const char *
-sockaddr_ntop(struct sockaddr *sa, socklen_t salen)
-{
-       static char addrbuf[NI_MAXHOST];
-
-       if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0,
-           NI_NUMERICHOST) != 0)
-               fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed");
-       return addrbuf;
-}
+static int show_other_keys(const char *, Key *);
 
 /*
  * Connect to the given ssh server using a proxy command.
@@ -266,7 +257,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
        memset(&hints, 0, sizeof(hints));
        hints.ai_family = family;
        hints.ai_socktype = SOCK_STREAM;
-       snprintf(strport, sizeof strport, "%d", port);
+       snprintf(strport, sizeof strport, "%u", port);
        if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
                fatal("%s: %.100s: %s", __progname, host,
                    gai_strerror(gaierr));
@@ -307,9 +298,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
                        } else {
                                if (errno == ECONNREFUSED)
                                        full_failure = 0;
-                               log("ssh: connect to address %s port %s: %s",
-                                   sockaddr_ntop(ai->ai_addr, ai->ai_addrlen),
-                                   strport, strerror(errno));
+                               debug("connect to address %s port %s: %s",
+                                   ntop, strport, strerror(errno));
                                /*
                                 * Close the failed socket; there appear to
                                 * be some problems when reusing a socket for
@@ -332,8 +322,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
        freeaddrinfo(aitop);
 
        /* Return failure if we didn't get a successful connection. */
-       if (attempt >= connection_attempts)
+       if (attempt >= connection_attempts) {
+               log("ssh: connect to host %s port %s: %s",
+                   host, strport, strerror(errno));
                return full_failure ? ECONNABORTED : ECONNREFUSED;
+       }
 
        debug("Connection established.");
 
@@ -476,7 +469,7 @@ confirm(const char *prompt)
                    (p[0] == '\0') || (p[0] == '\n') ||
                    strncasecmp(p, "no", 2) == 0)
                        ret = 0;
-               if (strncasecmp(p, "yes", 3) == 0)
+               if (p && strncasecmp(p, "yes", 3) == 0)
                        ret = 1;
                if (p)
                        xfree(p);
@@ -489,7 +482,6 @@ confirm(const char *prompt)
  * check whether the supplied host key is valid, return -1 if the key
  * is not valid. the user_hostfile will not be updated if 'readonly' is true.
  */
-
 static int
 check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
     int readonly, const char *user_hostfile, const char *system_hostfile)
@@ -504,7 +496,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
        int salen;
        char ntop[NI_MAXHOST];
        char msg[1024];
-       int len, host_line, ip_line;
+       int len, host_line, ip_line, has_keys;
        const char *host_file = NULL, *ip_file = NULL;
 
        /*
@@ -648,14 +640,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                            "have requested strict checking.", type, host);
                        goto fail;
                } else if (options.strict_host_key_checking == 2) {
+                       has_keys = show_other_keys(host, host_key);
                        /* The default */
                        fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
                        snprintf(msg, sizeof(msg),
                            "The authenticity of host '%.200s (%s)' can't be "
-                           "established.\n"
+                           "established%s\n"
                            "%s key fingerprint is %s.\n"
                            "Are you sure you want to continue connecting "
-                           "(yes/no)? ", host, ip, type, fp);
+                           "(yes/no)? ",
+                            host, ip,
+                            has_keys ? ",\nbut keys of different type are already "
+                            "known for this host." : ".",
+                            type, fp);
                        xfree(fp);
                        if (!confirm(msg))
                                goto fail;
@@ -758,6 +755,9 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                 * accept the authentication.
                 */
                break;
+       case HOST_FOUND:
+               fatal("internal error");
+               break;
        }
 
        if (options.check_host_ip && host_status != HOST_CHANGED &&
@@ -869,3 +869,58 @@ ssh_put_password(char *password)
        memset(padded, 0, size);
        xfree(padded);
 }
+
+static int
+show_key_from_file(const char *file, const char *host, int keytype)
+{
+       Key *found;
+       char *fp;
+       int line, ret;
+
+       found = key_new(keytype);
+       if ((ret = lookup_key_in_hostfile_by_type(file, host,
+           keytype, found, &line))) {
+               fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
+               log("WARNING: %s key found for host %s\n"
+                   "in %s:%d\n"
+                   "%s key fingerprint %s.",
+                   key_type(found), host, file, line,
+                   key_type(found), fp);
+               xfree(fp);
+       }
+       key_free(found);
+       return (ret);
+}
+
+/* print all known host keys for a given host, but skip keys of given type */
+static int
+show_other_keys(const char *host, Key *key)
+{
+       int type[] = { KEY_RSA1, KEY_RSA, KEY_DSA, -1};
+       int i, found = 0;
+
+       for (i = 0; type[i] != -1; i++) {
+               if (type[i] == key->type)
+                       continue;
+               if (type[i] != KEY_RSA1 &&
+                   show_key_from_file(options.user_hostfile2, host, type[i])) {
+                       found = 1;
+                       continue;
+               }
+               if (type[i] != KEY_RSA1 &&
+                   show_key_from_file(options.system_hostfile2, host, type[i])) {
+                       found = 1;
+                       continue;
+               }
+               if (show_key_from_file(options.user_hostfile, host, type[i])) {
+                       found = 1;
+                       continue;
+               }
+               if (show_key_from_file(options.system_hostfile, host, type[i])) {
+                       found = 1;
+                       continue;
+               }
+               debug2("no key of type %d for host %s", type[i], host);
+       }
+       return (found);
+}