- (stevesk) [auth1.c] fix password auth for protocol 1 when

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index 3b0f286fd6f6419b4757ee0e778c55eab58d990f..cefff8d627650409b3efcffa1e666b17fadef4e8 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  *
- * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+ * Copyright (c) 1999, 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 1999 Niels Provos.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,15 +36,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.29 2001/12/18 10:04:21 jakob Exp $");
 
 #include "packet.h"
 #include "match.h"
-#include "ssh.h"
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
 #include "key.h"
 #include "hostfile.h"
+#include "log.h"
 
 /*
  * Parses an RSA (number of bits, e, n) or DSA key from a string.  Moves the
@@ -52,7 +50,7 @@ RCSID("$OpenBSD: hostfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $");
  */
 
 int
-hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
+hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
 {
        char *cp;
 
@@ -73,18 +71,7 @@ hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
        return 1;
 }
 
-int
-auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)
-{
-       Key *k = key_new(KEY_RSA1);
-       int ret = hostfile_read_key(cpp, bitsp, k);
-       BN_copy(e, k->rsa->e);
-       BN_copy(n, k->rsa->n);
-       key_free(k);
-       return ret;
-}
-
-int
+static int
 hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)
 {
        if (key == NULL || key->type != KEY_RSA1 || key->rsa == NULL)
@@ -107,15 +94,17 @@ hostfile_check_key(int bits, Key *key, const char *host, const char *filename, i
  */
 
 HostStatus
-check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *found)
+check_host_in_hostfile(const char *filename, const char *host, Key *key,
+    Key *found, int *numret)
 {
        FILE *f;
        char line[8192];
        int linenum = 0;
-       unsigned int kbits, hostlen;
+       u_int kbits;
        char *cp, *cp2;
        HostStatus end_return;
 
+       debug3("check_host_in_hostfile: filename %s", filename);
        if (key == NULL)
                fatal("no key to look up");
        /* Open the file containing the list of known hosts. */
@@ -123,9 +112,6 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *fo
        if (!f)
                return HOST_NEW;
 
-       /* Cache the length of the host name. */
-       hostlen = strlen(host);
-
        /*
         * Return value when the loop terminates.  This is set to
         * HOST_CHANGED if we have seen a different key for the host and have
@@ -133,7 +119,7 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *fo
         */
        end_return = HOST_NEW;
 
-       /* Go trough the file. */
+       /* Go through the file. */
        while (fgets(line, sizeof(line), f)) {
                cp = line;
                linenum++;
@@ -149,7 +135,7 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *fo
                        ;
 
                /* Check if the host name matches. */
-               if (match_hostname(host, cp, (unsigned int) (cp2 - cp)) != 1)
+               if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1)
                        continue;
 
                /* Got a match.  Skip host name. */
@@ -164,9 +150,13 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *fo
                if (!hostfile_check_key(kbits, found, host, filename, linenum))
                        continue;
 
+               if (numret != NULL)
+                       *numret = linenum;
+
                /* Check if the current key is the same as the given key. */
                if (key_equal(key, found)) {
                        /* Ok, they match. */
+                       debug3("check_host_in_hostfile: match line %d", linenum);
                        fclose(f);
                        return HOST_OK;
                }