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

Diff for /src/usr.bin/ssh/ssh-rsa.c between version 1.55 and 1.56

version 1.55, 2015/12/04 16:41:28 version 1.56, 2015/12/07 20:04:09
Line 48 
Line 48 
 static int  static int
 rsa_hash_alg_from_ident(const char *ident)  rsa_hash_alg_from_ident(const char *ident)
 {  {
         if (ident == NULL || strlen(ident) == 0)  
                 return SSH_DIGEST_SHA1;  
         if (strcmp(ident, "ssh-rsa") == 0)          if (strcmp(ident, "ssh-rsa") == 0)
                 return SSH_DIGEST_SHA1;                  return SSH_DIGEST_SHA1;
         if (strcmp(ident, "rsa-sha2-256") == 0)          if (strcmp(ident, "rsa-sha2-256") == 0)
                 return SSH_DIGEST_SHA256;                  return SSH_DIGEST_SHA256;
         if (strcmp(ident, "rsa-sha2-512") == 0)          if (strcmp(ident, "rsa-sha2-512") == 0)
                 return SSH_DIGEST_SHA512;                  return SSH_DIGEST_SHA512;
         if (strncmp(ident, "ssh-rsa-cert", strlen("ssh-rsa-cert")) == 0)  
                 return SSH_DIGEST_SHA1;  
         return -1;          return -1;
 }  }
   
Line 92 
Line 88 
         if (sigp != NULL)          if (sigp != NULL)
                 *sigp = NULL;                  *sigp = NULL;
   
         hash_alg = rsa_hash_alg_from_ident(alg_ident);          if (alg_ident == NULL || strlen(alg_ident) == 0 ||
               strncmp(alg_ident, "ssh-rsa-cert", strlen("ssh-rsa-cert")) == 0)
                   hash_alg = SSH_DIGEST_SHA1;
           else
                   hash_alg = rsa_hash_alg_from_ident(alg_ident);
         if (key == NULL || key->rsa == NULL || hash_alg == -1 ||          if (key == NULL || key->rsa == NULL || hash_alg == -1 ||
             sshkey_type_plain(key->type) != KEY_RSA ||              sshkey_type_plain(key->type) != KEY_RSA ||
             BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)              BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56