release new patch today

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

diff --git a/openssh/auth-rh-rsa.c b/openssh/auth-rh-rsa.c
index d1b7ae996d50947a5aa46b572ec8bd018b74541d..8a486b330a0bab62554210fc0382ac0ed36687da 100644 (file)
--- a/openssh/auth-rh-rsa.c
+++ b/openssh/auth-rh-rsa.c
@@ -13,9 +13,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.26 2001/11/07 22:41:51 markus Exp $");
 
 #include "packet.h"
+#include "xmalloc.h"
 #include "uidswap.h"
 #include "log.h"
 #include "servconf.h"
@@ -31,15 +32,16 @@ RCSID("$OpenBSD: auth-rh-rsa.c,v 1.29 2002/03/04 12:43:06 markus Exp $");
  */
 
 int
-auth_rhosts_rsa(struct passwd *pw, const char *client_user, 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 || client_host_key->rsa == NULL)
+       if (pw == NULL || client_host_key == NULL)
                return 0;
 
        /* Check if we would accept it using rhosts authentication. */
@@ -47,14 +49,21 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *client_host_key
                return 0;
 
        canonical_hostname = get_canonical_hostname(
-           options.verify_reverse_mapping);
+           options.reverse_mapping_check);
 
        debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);
 
-       host_status = check_key_in_hostfiles(pw, client_host_key,
-           canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE,
+       /* 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 ? NULL : _PATH_SSH_USER_HOSTFILE);
 
+       key_free(client_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.");
@@ -63,7 +72,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, Key *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->rsa)) {
+       if (!auth_rsa_challenge_dialog(client_host_key)) {
                log("Client on %.800s failed to respond correctly to host authentication.",
                    canonical_hostname);
                return 0;