Added in Linux's select issue to TODO. Which may have to do with the

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index bac285da50f9fa22358536cc199709b5e7162a8b..3b0f286fd6f6419b4757ee0e778c55eab58d990f 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.18 2000/04/29 18:11:52 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.21 2000/11/12 19:50:37 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
@@ -32,15 +54,13 @@ RCSID("$OpenBSD: hostfile.c,v 1.18 2000/04/29 18:11:52 markus Exp $");
 int
 hostfile_read_key(char **cpp, unsigned 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)
 {
-       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,7 +87,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: "
@@ -129,7 +149,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, (unsigned int) (cp2 - cp)) != 1)
                        continue;
 
                /* Got a match.  Skip host name. */