[BACK]Return to auth-rh-rsa.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/auth-rh-rsa.c between version 1.17.2.7 and 1.18

version 1.17.2.7, 2002/03/08 17:04:41 version 1.18, 2000/11/12 19:50:37
Line 16 
Line 16 
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "packet.h"  #include "packet.h"
   #include "ssh.h"
   #include "xmalloc.h"
 #include "uidswap.h"  #include "uidswap.h"
 #include "log.h"  
 #include "servconf.h"  #include "servconf.h"
   
   #include <openssl/rsa.h>
   #include <openssl/dsa.h>
 #include "key.h"  #include "key.h"
 #include "hostfile.h"  #include "hostfile.h"
 #include "pathnames.h"  
 #include "auth.h"  
 #include "canohost.h"  
   
 /*  /*
  * Tries to authenticate the user using the .rhosts file and the host using   * Tries to authenticate the user using the .rhosts file and the host using
Line 31 
Line 32 
  */   */
   
 int  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;          extern ServerOptions options;
         const char *canonical_hostname;          const char *canonical_hostname;
         HostStatus host_status;          HostStatus host_status;
           Key *client_key, *found;
   
         debug("Trying rhosts with RSA host authentication for client user %.100s", client_user);          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;                  return 0;
   
         /* Check if we would accept it using rhosts authentication. */          /* Check if we would accept it using rhosts authentication. */
         if (!auth_rhosts(pw, client_user))          if (!auth_rhosts(pw, client_user))
                 return 0;                  return 0;
   
         canonical_hostname = get_canonical_hostname(          canonical_hostname = get_canonical_hostname();
             options.verify_reverse_mapping);  
   
         debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);          debug("Rhosts RSA authentication: canonical host %.900s", canonical_hostname);
   
         host_status = check_key_in_hostfiles(pw, client_host_key,          /* wrap the RSA key into a 'generic' key */
             canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE,          client_key = key_new(KEY_RSA1);
             options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);          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. */
           host_status = check_host_in_hostfile(SSH_SYSTEM_HOSTFILE, canonical_hostname,
               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
                    */
                   if (options.strict_modes &&
                       (stat(user_hostfile, &st) == 0) &&
                       ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
                        (st.st_mode & 022) != 0)) {
                           log("Rhosts RSA authentication refused for %.100s: bad owner or modes for %.200s",
                               pw->pw_name, user_hostfile);
                   } else {
                           /* 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_key, found);
                           restore_uid();
                   }
                   xfree(user_hostfile);
           }
           key_free(client_key);
           key_free(found);
   
         if (host_status != HOST_OK) {          if (host_status != HOST_OK) {
                 debug("Rhosts with RSA host authentication denied: unknown or invalid host key");                  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.");                  packet_send_debug("Your host key cannot be verified: unknown or invalid host key.");
Line 63 
Line 96 
         /* A matching host key was found and is known. */          /* A matching host key was found and is known. */
   
         /* Perform the challenge-response dialog with the client for the host key. */          /* 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.",                  log("Client on %.800s failed to respond correctly to host authentication.",
                     canonical_hostname);                      canonical_hostname);
                 return 0;                  return 0;
Legend:
Removed from v.1.17.2.7  
changed lines
  Added in v.1.18