One way to massive patch. <sigh> It compiles and works under Linux..

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index e1c2429bd649f5d5dc81fe7dbbf21ee1fad46c7b..1c3fb22ad43acba6c47fe79a666f394fb4545822 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,20 +1,42 @@
 /*
- *
- * hostfile.c
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
+ * Functions for manipulating the known hosts files.
  *
- * Created: Thu Jun 29 07:10:56 1995 ylo
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  *
- * Functions for manipulating the known hosts files.
  *
+ * 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
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.17 2000/04/26 20:56:29 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.23 2000/12/21 15:10:16 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
@@ -30,17 +52,15 @@ RCSID("$OpenBSD: hostfile.c,v 1.17 2000/04/26 20:56:29 markus 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. */
@@ -49,14 +69,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);
@@ -67,13 +87,13 @@ 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)) {
-               error("Warning: %s, line %d: keysize mismatch for host %s: "
+               log("Warning: %s, line %d: keysize mismatch for host %s: "
                    "actual %d vs. announced %d.",
                    filename, linenum, host, BN_num_bits(key->rsa->n), bits);
-               error("Warning: replace %d with %d in %s, line %d.",
+               log("Warning: replace %d with %d in %s, line %d.",
                    bits, BN_num_bits(key->rsa->n), filename, linenum);
        }
        return 1;
@@ -87,12 +107,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;
 
@@ -129,7 +150,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)))
+               if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1)
                        continue;
 
                /* Got a match.  Skip host name. */
@@ -144,6 +165,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. */