- itojun@cvs.openbsd.org 2002/03/11 03:19:53

[openssh.git] / auth-rh-rsa.c

diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index 870436b55163d074fc9eac6189258adefca8e606..d1b7ae996d50947a5aa46b572ec8bd018b74541d 100644 (file)
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -13,10 +13,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $");
 
 #include "packet.h"
-#include "xmalloc.h"
 #include "uidswap.h"
 #include "log.h"
 #include "servconf.h"
@@ -24,7 +23,6 @@ RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $");
 #include "hostfile.h"
 #include "pathnames.h"
 #include "auth.h"
-#include "tildexpand.h"
 #include "canohost.h"
 
 /*
@@ -33,16 +31,15 @@ RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $");
  */
 
 int
-auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key)
+auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *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)
+       if (pw == NULL || client_host_key == NULL || client_host_key->rsa == NULL)
                return 0;
 
        /* Check if we would accept it using rhosts authentication. */
@@ -50,20 +47,13 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
                return 0;
 
        canonical_hostname = get_canonical_hostname(
-           options.reverse_mapping_check);
+           options.verify_reverse_mapping);
 
        debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);
 
-       /* 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);
-
-       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);
-
-       key_free(client_key);
+       host_status = check_key_in_hostfiles(pw, client_host_key,
+           canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE,
+           options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
 
        if (host_status != HOST_OK) {
                debug("Rhosts with RSA host authentication denied: unknown or invalid host key");
@@ -73,7 +63,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
        /* A matching host key was found and is known. */
 
        /* Perform the challenge-response dialog with the client for the host key. */
-       if (!auth_rsa_challenge_dialog(client_host_key)) {
+       if (!auth_rsa_challenge_dialog(client_host_key->rsa)) {
                log("Client on %.800s failed to respond correctly to host authentication.",
                    canonical_hostname);
                return 0;