update patch version

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

diff --git a/openssh/auth-rh-rsa.c b/openssh/auth-rh-rsa.c
index d7848d04c4dd6ba0fdb56efcb91ac9823d8c9f6c..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.34 2002/03/25 09:25: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"
@@ -25,48 +26,45 @@ RCSID("$OpenBSD: auth-rh-rsa.c,v 1.34 2002/03/25 09:25:06 markus Exp $");
 #include "auth.h"
 #include "canohost.h"
 
-#include "monitor_wrap.h"
-
-/* import */
-extern ServerOptions options;
+/*
+ * 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_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;
-
-       debug("Trying rhosts with RSA host authentication for client user %.100s",
-           cuser);
+       /* 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);
 
-       if (pw == NULL || client_host_key == NULL ||
-           client_host_key->rsa == NULL)
-               return 0;
+       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);
 
-       chost = (char *)get_canonical_hostname(options.verify_reverse_mapping);
-       debug("Rhosts RSA authentication: canonical host %.900s", chost);
+       key_free(client_key);
 
-       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 +74,7 @@ auth_rhosts_rsa(struct passwd *pw, char *cuser, Key *client_host_key)
        /* 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 +83,7 @@ auth_rhosts_rsa(struct passwd *pw, char *cuser, Key *client_host_key)
         */
 
        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;
 }