[BACK]Return to hostfile.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/hostfile.c between version 1.20 and 1.20.2.5

version 1.20, 2000/09/07 20:27:51 version 1.20.2.5, 2001/09/27 00:15:42
Line 11 
Line 11 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  *   *
  *   *
  * Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.   * Copyright (c) 1999, 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 1999 Niels Provos.  All rights reserved.   * Copyright (c) 1999 Niels Provos.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 40 
Line 40 
   
 #include "packet.h"  #include "packet.h"
 #include "match.h"  #include "match.h"
 #include "ssh.h"  
 #include <openssl/rsa.h>  
 #include <openssl/dsa.h>  
 #include "key.h"  #include "key.h"
 #include "hostfile.h"  #include "hostfile.h"
   #include "log.h"
   
 /*  /*
  * Parses an RSA (number of bits, e, n) or DSA key from a string.  Moves the   * Parses an RSA (number of bits, e, n) or DSA key from a string.  Moves the
  * pointer over the key.  Skips any whitespace at the beginning and at end.   * pointer over the key.  Skips any whitespace at the beginning and at end.
  */   */
   
 int  static int
 hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)  hostfile_read_key(char **cpp, u_int *bitsp, Key *ret)
 {  {
         unsigned int bits;  
         char *cp;          char *cp;
   
         /* Skip leading whitespace. */          /* Skip leading whitespace. */
         for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)          for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
                 ;                  ;
   
         bits = key_read(ret, &cp);          if (key_read(ret, &cp) != 1)
         if (bits == 0)  
                 return 0;                  return 0;
   
         /* Skip trailing whitespace. */          /* Skip trailing whitespace. */
Line 71 
Line 67 
   
         /* Return results. */          /* Return results. */
         *cpp = cp;          *cpp = cp;
         *bitsp = bits;          *bitsp = key_size(ret);
         return 1;          return 1;
 }  }
   
 int  int
 auth_rsa_read_key(char **cpp, unsigned int *bitsp, BIGNUM * e, BIGNUM * n)  auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n)
 {  {
         Key *k = key_new(KEY_RSA);          Key *k = key_new(KEY_RSA1);
         int ret = hostfile_read_key(cpp, bitsp, k);          int ret = hostfile_read_key(cpp, bitsp, k);
         BN_copy(e, k->rsa->e);          BN_copy(e, k->rsa->e);
         BN_copy(n, k->rsa->n);          BN_copy(n, k->rsa->n);
Line 86 
Line 82 
         return ret;          return ret;
 }  }
   
 int  static int
 hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)  hostfile_check_key(int bits, Key *key, const char *host, const char *filename, int linenum)
 {  {
         if (key == NULL || key->type != KEY_RSA || key->rsa == NULL)          if (key == NULL || key->type != KEY_RSA1 || key->rsa == NULL)
                 return 1;                  return 1;
         if (bits != BN_num_bits(key->rsa->n)) {          if (bits != BN_num_bits(key->rsa->n)) {
                 log("Warning: %s, line %d: keysize mismatch for host %s: "                  log("Warning: %s, line %d: keysize mismatch for host %s: "
Line 109 
Line 105 
  */   */
   
 HostStatus  HostStatus
 check_host_in_hostfile(const char *filename, const char *host, Key *key, Key *found)  check_host_in_hostfile(const char *filename, const char *host, Key *key,
       Key *found, int *numret)
 {  {
         FILE *f;          FILE *f;
         char line[8192];          char line[8192];
         int linenum = 0;          int linenum = 0;
         unsigned int kbits, hostlen;          u_int kbits;
         char *cp, *cp2;          char *cp, *cp2;
         HostStatus end_return;          HostStatus end_return;
   
           debug3("check_host_in_hostfile: filename %s", filename);
         if (key == NULL)          if (key == NULL)
                 fatal("no key to look up");                  fatal("no key to look up");
         /* Open the file containing the list of known hosts. */          /* Open the file containing the list of known hosts. */
Line 125 
Line 123 
         if (!f)          if (!f)
                 return HOST_NEW;                  return HOST_NEW;
   
         /* Cache the length of the host name. */  
         hostlen = strlen(host);  
   
         /*          /*
          * Return value when the loop terminates.  This is set to           * Return value when the loop terminates.  This is set to
          * HOST_CHANGED if we have seen a different key for the host and have           * HOST_CHANGED if we have seen a different key for the host and have
Line 135 
Line 130 
          */           */
         end_return = HOST_NEW;          end_return = HOST_NEW;
   
         /* Go trough the file. */          /* Go through the file. */
         while (fgets(line, sizeof(line), f)) {          while (fgets(line, sizeof(line), f)) {
                 cp = line;                  cp = line;
                 linenum++;                  linenum++;
Line 151 
Line 146 
                         ;                          ;
   
                 /* Check if the host name matches. */                  /* Check if the host name matches. */
                 if (match_hostname(host, cp, (unsigned int) (cp2 - cp)) != 1)                  if (match_hostname(host, cp, (u_int) (cp2 - cp)) != 1)
                         continue;                          continue;
   
                 /* Got a match.  Skip host name. */                  /* Got a match.  Skip host name. */
Line 166 
Line 161 
                 if (!hostfile_check_key(kbits, found, host, filename, linenum))                  if (!hostfile_check_key(kbits, found, host, filename, linenum))
                         continue;                          continue;
   
                   if (numret != NULL)
                           *numret = linenum;
   
                 /* Check if the current key is the same as the given key. */                  /* Check if the current key is the same as the given key. */
                 if (key_equal(key, found)) {                  if (key_equal(key, found)) {
                         /* Ok, they match. */                          /* Ok, they match. */
                           debug3("check_host_in_hostfile: match line %d", linenum);
                         fclose(f);                          fclose(f);
                         return HOST_OK;                          return HOST_OK;
                 }                  }
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.20.2.5