- (djm) CVS OpenBSD sync:

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index c594c29aa0bf282c8279613c7012e29057d83717..9c03a468800d390b2d871e456515be7f311fe23f 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,35 +1,48 @@
 /*
- * 
- * hostfile.c
- * 
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
- * Created: Thu Jun 29 07:10:56 1995 ylo
- * 
  * Functions for manipulating the known hosts files.
- * 
+ *
+ * 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".
+ *
+ *
+ * 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.15 2000/04/12 09:39:10 markus Exp $");
-
-#ifdef HAVE_OPENSSL
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/bn.h>
-#include <ssl/rsa.h>
-#include <ssl/dsa.h>
-#endif
+RCSID("$OpenBSD: hostfile.c,v 1.20 2000/09/07 20:27:51 deraadt Exp $");
 
 #include "packet.h"
 #include "match.h"
 #include "ssh.h"
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 #include "key.h"
 #include "hostfile.h"
 
@@ -48,13 +61,8 @@ hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
        for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
                ;
 
-       /* Get number of bits. */
-       if (*cp < '0' || *cp > '9')
-               return 0;       /* Bad bit count... */
-       for (bits = 0; *cp >= '0' && *cp <= '9'; cp++)
-               bits = 10 * bits + *cp - '0';
-
-       if (!key_read(ret, bits, &cp))
+       bits = key_read(ret, &cp);
+       if (bits == 0)
                return 0;
 
        /* Skip trailing whitespace. */
@@ -84,10 +92,10 @@ hostfile_check_key(int bits, Key *key, const char *host, const char *filename, i
        if (key == NULL || key->type != KEY_RSA || 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;
@@ -143,7 +151,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. */
@@ -191,24 +199,18 @@ add_host_to_hostfile(const char *filename, const char *host, Key *key)
 {
        FILE *f;
        int success = 0;
-
        if (key == NULL)
-               return 1;
-
-       /* Open the file for appending. */
+               return 1;       /* XXX ? */
        f = fopen(filename, "a");
        if (!f)
                return 0;
-
        fprintf(f, "%s ", host);
        if (key_write(key, f)) {
-               fprintf(f, "\n");
                success = 1;
        } else {
-               error("add_host_to_hostfile: saving key failed");
+               error("add_host_to_hostfile: saving key in %s failed", filename);
        }
-
-       /* Close the file. */
+       fprintf(f, "\n");
        fclose(f);
        return success;
 }