- (stevesk) OpenSSH CVS update:

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

diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index 0b8ea698d8663517cf5bb20115bdaf507d557d5b..a9f17ef8383a737bbfff3951a9f753da7b0e4145 100644 (file)
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -1,21 +1,19 @@
 /*
- * 
- * auth-rh-rsa.c
- * 
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
- * Created: Sun May  7 03:08:06 1995 ylo
- * 
  * Rhosts or /etc/hosts.equiv authentication combined with RSA host
  * authentication.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.18 2000/11/12 19:50:37 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -23,19 +21,28 @@ RCSID("$Id$");
 #include "uidswap.h"
 #include "servconf.h"
 
-/* Tries to authenticate the user using the .rhosts file and the host using
-   its host key.  Returns true if authentication succeeds. */
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include "key.h"
+#include "hostfile.h"
 
-int 
-auth_rhosts_rsa(struct passwd *pw, const char *client_user,
-               BIGNUM *client_host_key_e, BIGNUM *client_host_key_n)
+/*
+ * 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, const char *client_user, RSA *client_host_key)
 {
        extern ServerOptions options;
        const char *canonical_hostname;
        HostStatus host_status;
-       BIGNUM *ke, *kn;
+       Key *client_key, *found;
 
-       debug("Trying rhosts with RSA host authentication for %.100s", client_user);
+       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, client_user))
@@ -43,22 +50,26 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user,
 
        canonical_hostname = get_canonical_hostname();
 
-       debug("Rhosts RSA authentication: canonical host %.900s",
-             canonical_hostname);
+       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);
+       found = key_new(KEY_RSA1);
 
        /* Check if we know the host and its host key. */
-       ke = BN_new();
-       kn = BN_new();
        host_status = check_host_in_hostfile(SSH_SYSTEM_HOSTFILE, canonical_hostname,
-                                            client_host_key_e, client_host_key_n,
-                                            ke, kn);
+           client_key, found);
 
        /* Check user host file unless ignored. */
        if (host_status != HOST_OK && !options.ignore_user_known_hosts) {
                struct stat st;
                char *user_hostfile = tilde_expand_filename(SSH_USER_HOSTFILE, pw->pw_uid);
-               /* Check file permissions of SSH_USER_HOSTFILE, auth_rsa()
-                  did already check pw->pw_dir, but there is a race XXX */
+               /*
+                * Check file permissions of SSH_USER_HOSTFILE, auth_rsa()
+                * did already check pw->pw_dir, but there is a race XXX
+                */
                if (options.strict_modes &&
                    (stat(user_hostfile, &st) == 0) &&
                    ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
@@ -69,14 +80,13 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user,
                        /* XXX race between stat and the following open() */
                        temporarily_use_uid(pw->pw_uid);
                        host_status = check_host_in_hostfile(user_hostfile, canonical_hostname,
-                                                            client_host_key_e, client_host_key_n,
-                                                            ke, kn);
+                           client_key, found);
                        restore_uid();
                }
                xfree(user_hostfile);
        }
-       BN_free(ke);
-       BN_free(kn);
+       key_free(client_key);
+       key_free(found);
 
        if (host_status != HOST_OK) {
                debug("Rhosts with RSA host authentication denied: unknown or invalid host key");
@@ -86,16 +96,18 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user,
        /* 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_e, client_host_key_n)) {
+       if (!auth_rsa_challenge_dialog(client_host_key)) {
                log("Client on %.800s failed to respond correctly to host authentication.",
                    canonical_hostname);
                return 0;
        }
-       /* We have authenticated the user using .rhosts or /etc/hosts.equiv, and the host using RSA.
-          We accept the authentication. */
+       /*
+        * We have authenticated the user using .rhosts or /etc/hosts.equiv,
+        * and the host using RSA. We accept the authentication.
+        */
 
        verbose("Rhosts with RSA host authentication accepted for %.100s, %.100s on %.700s.",
-               pw->pw_name, client_user, canonical_hostname);
+          pw->pw_name, client_user, canonical_hostname);
        packet_send_debug("Rhosts with RSA host authentication accepted.");
        return 1;
 }