[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.21

version 1.20, 2000/09/07 20:27:51 version 1.21, 2000/11/12 19:50:37
Line 54 
Line 54 
 int  int
 hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)  hostfile_read_key(char **cpp, unsigned 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 69 
   
         /* 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, unsigned 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 89 
Line 87 
 int  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: "
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21