- markus@cvs.openbsd.org 2001/03/23 14:28:32

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index 9c03a468800d390b2d871e456515be7f311fe23f..b285ee83cf545aa43f04efc746081e9261ec0bff 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -36,15 +36,13 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.20 2000/09/07 20:27:51 deraadt Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.24 2001/01/21 19:05:49 markus 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,17 +50,15 @@ RCSID("$OpenBSD: hostfile.c,v 1.20 2000/09/07 20:27:51 deraadt Exp $");
  */
 
 int
-hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
+hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
 {
-       unsigned int bits;
        char *cp;
 
        /* Skip leading whitespace. */
        for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
                ;
 
-       bits = key_read(ret, &cp);
-       if (bits == 0)
+       if (key_read(ret, &cp) != 1)
                return 0;
 
        /* Skip trailing whitespace. */
@@ -71,14 +67,14 @@ hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
 
        /* Return results. */
        *cpp = cp;
-       *bitsp = bits;
+       *bitsp = key_size(ret);
        return 1;
 }
 
 int
-auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)
+auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n)
 {
-       Key *k = key_new(KEY_RSA);
+       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);
@@ -89,7 +85,7 @@ auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)
 int
 hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)
 {
-       if (key == NULL || key->type != KEY_RSA || key->rsa == NULL)
+       if (key == NULL || key->type != KEY_RSA1 || key->rsa == NULL)
                return 1;
        if (bits != BN_num_bits(key->rsa->n)) {
                log("Warning: %s, line %d: keysize mismatch for host %s: "
@@ -109,12 +105,13 @@ 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, hostlen;
        char *cp, *cp2;
        HostStatus end_return;
 
@@ -151,7 +148,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. */
@@ -166,6 +163,9 @@ 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. */