The man2html from jbasney on pkilab2 works whereas the standard one doesn't.

[gssapi-openssh.git] / openssh / hostfile.c

diff --git a/openssh/hostfile.c b/openssh/hostfile.c
index 88c0549127820632de8a3b351468cb89a9de00aa..eeed920fa797a15f42d5e4eb598486be413c5699 100644 (file)
--- a/openssh/hostfile.c
+++ b/openssh/hostfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.32 2003/11/10 16:23:41 jakob Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.28 2001/06/25 08:25:37 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
@@ -49,7 +49,7 @@ RCSID("$OpenBSD: hostfile.c,v 1.32 2003/11/10 16:23:41 jakob Exp $");
  * pointer over the key.  Skips any whitespace at the beginning and at end.
  */
 
-int
+static int
 hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
 {
        char *cp;
@@ -71,16 +71,27 @@ 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;
+}
+
 static int
-hostfile_check_key(int bits, const Key *key, const char *host, const char *filename, int linenum)
+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)) {
-               logit("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);
-               logit("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;
@@ -91,14 +102,11 @@ hostfile_check_key(int bits, const Key *key, const char *host, const char *filen
  * 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.
  */
 
-static HostStatus
-check_host_in_hostfile_by_key_or_type(const char *filename,
-    const char *host, const Key *key, int keytype, Key *found, int *numret)
+HostStatus
+check_host_in_hostfile(const char *filename, const char *host, Key *key,
+    Key *found, int *numret)
 {
        FILE *f;
        char line[8192];
@@ -108,7 +116,8 @@ check_host_in_hostfile_by_key_or_type(const char *filename,
        HostStatus end_return;
 
        debug3("check_host_in_hostfile: filename %s", filename);
-
+       if (key == NULL)
+               fatal("no key to look up");
        /* Open the file containing the list of known hosts. */
        f = fopen(filename, "r");
        if (!f)
@@ -149,20 +158,12 @@ check_host_in_hostfile_by_key_or_type(const char *filename,
                 */
                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. */
@@ -187,31 +188,13 @@ check_host_in_hostfile_by_key_or_type(const char *filename,
        return end_return;
 }
 
-HostStatus
-check_host_in_hostfile(const char *filename, const char *host, const 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.
  */
 
 int
-add_host_to_hostfile(const char *filename, const char *host, const Key *key)
+add_host_to_hostfile(const char *filename, const char *host, Key *key)
 {
        FILE *f;
        int success = 0;