===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/hostfile.c,v
retrieving revision 1.20.2.6
retrieving revision 1.21
diff -u -r1.20.2.6 -r1.21
--- src/usr.bin/ssh/hostfile.c	2002/03/08 17:04:42	1.20.2.6
+++ src/usr.bin/ssh/hostfile.c	2000/11/12 19:50:37	1.21
@@ -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,13 +36,15 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.20.2.6 2002/03/08 17:04:42 brad Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.21 2000/11/12 19:50:37 markus 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
@@ -50,7 +52,7 @@
  */
 
 int
-hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
+hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
 {
 	char *cp;
 
@@ -71,7 +73,18 @@
 	return 1;
 }
 
-static int
+int
+auth_rsa_read_key(char **cpp, unsigned 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
 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)
@@ -94,17 +107,15 @@
  */
 
 HostStatus
-check_host_in_hostfile(const char *filename, const char *host, Key *key,
-    Key *found, int *numret)
+check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *found)
 {
 	FILE *f;
 	char line[8192];
 	int linenum = 0;
-	u_int kbits;
+	unsigned int kbits, hostlen;
 	char *cp, *cp2;
 	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. */
@@ -112,6 +123,9 @@
 	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
@@ -119,7 +133,7 @@
 	 */
 	end_return = HOST_NEW;
 
-	/* Go through the file. */
+	/* Go trough the file. */
 	while (fgets(line, sizeof(line), f)) {
 		cp = line;
 		linenum++;
@@ -135,7 +149,7 @@
 			;
 
 		/* Check if the host name matches. */
-		if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1)
+		if (match_hostname(host, cp, (unsigned int) (cp2 - cp)) != 1)
 			continue;
 
 		/* Got a match.  Skip host name. */
@@ -150,13 +164,9 @@
 		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. */
-			debug3("check_host_in_hostfile: match line %d", linenum);
 			fclose(f);
 			return HOST_OK;
 		}