- (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before

[openssh.git] / hostfile.c

diff --git a/hostfile.c b/hostfile.c
index 1c3fb22ad43acba6c47fe79a666f394fb4545822..42a8aa71dae6d844ab22df57fc1bdc71b4296269 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.23 2000/12/21 15:10:16 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.31 2003/04/08 20:21:28 itojun 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
@@ -73,27 +71,16 @@ hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
        return 1;
 }
 
-int
-auth_rsa_read_key(char **cpp, u_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)
                return 1;
        if (bits != BN_num_bits(key->rsa->n)) {
-               log("Warning: %s, line %d: keysize mismatch for host %s: "
+               logit("Warning: %s, line %d: keysize mismatch for host %s: "
                    "actual %d vs. announced %d.",
                    filename, linenum, host, BN_num_bits(key->rsa->n), bits);
-               log("Warning: replace %d with %d in %s, line %d.",
+               logit("Warning: replace %d with %d in %s, line %d.",
                    bits, BN_num_bits(key->rsa->n), filename, linenum);
        }
        return 1;
@@ -104,29 +91,29 @@ hostfile_check_key(int bits, Key *key, const char *host, const char *filename, i
  * in the list of our known hosts. Returns HOST_OK if the host is known and
  * has the specified key, HOST_NEW if the host is not known, and HOST_CHANGED
  * if the host is known but used to have a different host key.
+ *
+ * If no 'key' has been specified and a key of type 'keytype' is known
+ * for the specified host, then HOST_FOUND is returned.
  */
 
-HostStatus
-check_host_in_hostfile(const char *filename, const char *host, Key *key,
-    Key *found, int *numret)
+static HostStatus
+check_host_in_hostfile_by_key_or_type(const char *filename,
+    const char *host, Key *key, int keytype, Key *found, int *numret)
 {
        FILE *f;
        char line[8192];
        int linenum = 0;
-       u_int kbits, hostlen;
+       u_int kbits;
        char *cp, *cp2;
        HostStatus end_return;
 
-       if (key == NULL)
-               fatal("no key to look up");
+       debug3("check_host_in_hostfile: filename %s", filename);
+
        /* Open the file containing the list of known hosts. */
        f = fopen(filename, "r");
        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
@@ -134,7 +121,7 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
         */
        end_return = HOST_NEW;
 
-       /* Go trough the file. */
+       /* Go through the file. */
        while (fgets(line, sizeof(line), f)) {
                cp = line;
                linenum++;
@@ -162,15 +149,24 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
                 */
                if (!hostfile_read_key(&cp, &kbits, found))
                        continue;
-               if (!hostfile_check_key(kbits, found, host, filename, linenum))
-                       continue;
 
                if (numret != NULL)
                        *numret = linenum;
 
+               if (key == NULL) {
+                       /* we found a key of the requested type */
+                       if (found->type == keytype)
+                               return HOST_FOUND;
+                       continue;
+               }
+
+               if (!hostfile_check_key(kbits, found, host, filename, linenum))
+                       continue;
+
                /* 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;
                }
@@ -191,6 +187,24 @@ check_host_in_hostfile(const char *filename, const char *host, Key *key,
        return end_return;
 }
 
+HostStatus
+check_host_in_hostfile(const char *filename, const char *host, Key *key,
+    Key *found, int *numret)
+{
+       if (key == NULL)
+               fatal("no key to look up");
+       return (check_host_in_hostfile_by_key_or_type(filename, host, key, 0,
+           found, numret));
+}
+
+int
+lookup_key_in_hostfile_by_type(const char *filename, const char *host,
+    int keytype, Key *found, int *numret)
+{
+       return (check_host_in_hostfile_by_key_or_type(filename, host, NULL,
+           keytype, found, numret) == HOST_FOUND);
+}
+
 /*
  * Appends an entry to the host file.  Returns false if the entry could not
  * be appended.