- (stevesk) [Makefile.in ssh-rand-helper.c]

[openssh.git] / ssh-keyscan.c

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index ad627bb99ea36bf3378efd8f2e335c712a65fb6a..80eab26927f734240bbfe6d8034a271ac46242d5 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.29 2001/08/30 22:22:32 markus Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.33 2001/12/10 20:34:31 markus Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
@@ -43,12 +43,12 @@ int IPv4or6 = AF_UNSPEC;
 #endif
 
 int ssh_port = SSH_DEFAULT_PORT;
- 
-#define KT_RSA1       1
-#define KT_DSA        2
-#define KT_RSA        4
- 
-int get_keytypes = KT_RSA1;   /* Get only RSA1 keys by default */
+
+#define KT_RSA1        1
+#define KT_DSA 2
+#define KT_RSA 4
+
+int get_keytypes = KT_RSA1;    /* Get only RSA1 keys by default */
 
 #define MAXMAXFD 256
 
@@ -493,8 +493,9 @@ static void
 congreet(int s)
 {
        char buf[256], *cp;
+       char remote_version[sizeof buf];
        size_t bufsiz;
-       int n = 0;
+       int remote_major, remote_minor, n = 0;
        con *c = &fdcon[s];
 
        bufsiz = sizeof(buf);
@@ -516,20 +517,21 @@ congreet(int s)
                return;
        }
        *cp = '\0';
+       if (sscanf(buf, "SSH-%d.%d-%[^\n]\n",
+           &remote_major, &remote_minor, remote_version) == 3)
+               compat_datafellows(remote_version);
+       else
+               datafellows = 0;
        if (c->c_keytype != KT_RSA1) {
-               int remote_major, remote_minor;
-               char remote_version[sizeof buf];
-
-               if (sscanf(buf, "SSH-%d.%d-%[^\n]\n",
-                   &remote_major, &remote_minor, remote_version) == 3)
-                       compat_datafellows(remote_version);
-               else
-                       datafellows = 0;
                if (!ssh2_capable(remote_major, remote_minor)) {
                        debug("%s doesn't support ssh2", c->c_name);
                        confree(s);
                        return;
                }
+       } else if (remote_major != 1) {
+               debug("%s doesn't support ssh1", c->c_name);
+               confree(s);
+               return;
        }
        fprintf(stderr, "# %s %s\n", c->c_name, chop(buf));
        n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n",
@@ -647,6 +649,8 @@ do_host(char *host)
        char *name = strnnsep(&host, " \t\n");
        int j;
 
+       if (name == NULL)
+               return;
        for (j = KT_RSA1; j <= KT_RSA; j *= 2) {
                if (get_keytypes & j) {
                        while (ncon >= MAXCON)
@@ -673,9 +677,9 @@ usage(void)
        fprintf(stderr, "  -p port     Connect to the specified port.\n");
        fprintf(stderr, "  -t keytype  Specify the host key type.\n");
        fprintf(stderr, "  -T timeout  Set connection timeout.\n");
-       fprintf(stderr, "  -v          Verbose; display verbose debugging messages.\n");
-       fprintf(stderr, "  -4          Use IPv4 only.\n");
-       fprintf(stderr, "  -6          Use IPv6 only.\n");
+        fprintf(stderr, "  -v          Verbose; display verbose debugging messages.\n");
+        fprintf(stderr, "  -4          Use IPv4 only.\n");
+        fprintf(stderr, "  -6          Use IPv6 only.\n");
        exit(1);
 }
 
@@ -685,11 +689,13 @@ main(int argc, char **argv)
        int debug_flag = 0, log_level = SYSLOG_LEVEL_INFO;
        int opt, fopt_count = 0;
        char *tname;
- 
+
        extern int optind;
        extern char *optarg;
 
        __progname = get_progname(argv[0]);
+       init_rng();
+       seed_rng();
        TAILQ_INIT(&tq);
 
        if (argc <= 1)
@@ -719,7 +725,7 @@ main(int argc, char **argv)
                        else
                                fatal("Too high debugging level.");
                        break;
-                case 'f':
+               case 'f':
                        if (strcmp(optarg, "-") == 0)
                                optarg = NULL;
                        argv[fopt_count++] = optarg;
@@ -740,7 +746,7 @@ main(int argc, char **argv)
                                        get_keytypes |= KT_RSA;
                                        break;
                                case KEY_UNSPEC:
-                                       fatal("unknown key type %s\n", tname);
+                                       fatal("unknown key type %s", tname);
                                }
                                tname = strtok(NULL, ",");
                        }
@@ -762,7 +768,6 @@ main(int argc, char **argv)
        log_init("ssh-keyscan", log_level, SYSLOG_FACILITY_USER, 1);
        fatal_add_cleanup(fatal_callback, NULL);
 
-
        maxfd = fdlim_get(1);
        if (maxfd < 0)
                fatal("%s: fdlim_get: bad value", __progname);