===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/auth-rh-rsa.c,v
retrieving revision 1.23.2.4
retrieving revision 1.24
diff -u -r1.23.2.4 -r1.24
--- src/usr.bin/ssh/Attic/auth-rh-rsa.c	2002/06/02 22:56:09	1.23.2.4
+++ src/usr.bin/ssh/Attic/auth-rh-rsa.c	2001/06/23 00:20:57	1.24
@@ -13,9 +13,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.23.2.4 2002/06/02 22:56:09 miod Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $");
 
 #include "packet.h"
+#include "xmalloc.h"
 #include "uidswap.h"
 #include "log.h"
 #include "servconf.h"
@@ -23,50 +24,48 @@
 #include "hostfile.h"
 #include "pathnames.h"
 #include "auth.h"
+#include "tildexpand.h"
 #include "canohost.h"
 
-#include "monitor_wrap.h"
+/*
+ * Tries to authenticate the user using the .rhosts file and the host using
+ * its host key.  Returns true if authentication succeeds.
+ */
 
-/* import */
-extern ServerOptions options;
-
 int
-auth_rhosts_rsa_key_allowed(struct passwd *pw, char *cuser, char *chost,
-    Key *client_host_key)
+auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key)
 {
+	extern ServerOptions options;
+	const char *canonical_hostname;
 	HostStatus host_status;
+	Key *client_key;
 
+	debug("Trying rhosts with RSA host authentication for client user %.100s", client_user);
+
+	if (pw == NULL || client_host_key == NULL)
+		return 0;
+
 	/* Check if we would accept it using rhosts authentication. */
-	if (!auth_rhosts(pw, cuser))
+	if (!auth_rhosts(pw, client_user))
 		return 0;
 
-	host_status = check_key_in_hostfiles(pw, client_host_key,
-	    chost, _PATH_SSH_SYSTEM_HOSTFILE,
-	    options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
+	canonical_hostname = get_canonical_hostname(
+	    options.reverse_mapping_check);
 
-	return (host_status == HOST_OK);
-}
+	debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);
 
-/*
- * Tries to authenticate the user using the .rhosts file and the host using
- * its host key.  Returns true if authentication succeeds.
- */
-int
-auth_rhosts_rsa(struct passwd *pw, char *cuser, Key *client_host_key)
-{
-	char *chost;
+	/* wrap the RSA key into a 'generic' key */
+	client_key = key_new(KEY_RSA1);
+	BN_copy(client_key->rsa->e, client_host_key->e);
+	BN_copy(client_key->rsa->n, client_host_key->n);
 
-	debug("Trying rhosts with RSA host authentication for client user %.100s",
-	    cuser);
+	host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname,
+	    _PATH_SSH_SYSTEM_HOSTFILE,
+	    options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL);
 
-	if (pw == NULL || client_host_key == NULL ||
-	    client_host_key->rsa == NULL)
-		return 0;
+	key_free(client_key);
 
-	chost = (char *)get_canonical_hostname(options.verify_reverse_mapping);
-	debug("Rhosts RSA authentication: canonical host %.900s", chost);
-
-	if (!PRIVSEP(auth_rhosts_rsa_key_allowed(pw, cuser, chost, client_host_key))) {
+	if (host_status != HOST_OK) {
 		debug("Rhosts with RSA host authentication denied: unknown or invalid host key");
 		packet_send_debug("Your host key cannot be verified: unknown or invalid host key.");
 		return 0;
@@ -76,7 +75,7 @@
 	/* Perform the challenge-response dialog with the client for the host key. */
 	if (!auth_rsa_challenge_dialog(client_host_key)) {
 		log("Client on %.800s failed to respond correctly to host authentication.",
-		    chost);
+		    canonical_hostname);
 		return 0;
 	}
 	/*
@@ -85,7 +84,7 @@
 	 */
 
 	verbose("Rhosts with RSA host authentication accepted for %.100s, %.100s on %.700s.",
-	   pw->pw_name, cuser, chost);
+	   pw->pw_name, client_user, canonical_hostname);
 	packet_send_debug("Rhosts with RSA host authentication accepted.");
 	return 1;
 }