[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.60 and 1.61

version 1.60, 2016/09/12 23:39:34 version 1.61, 2017/05/07 23:15:59
Line 94 
Line 94 
         else          else
                 hash_alg = rsa_hash_alg_from_ident(alg_ident);                  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)  
                 return SSH_ERR_INVALID_ARGUMENT;                  return SSH_ERR_INVALID_ARGUMENT;
           if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
                   return SSH_ERR_KEY_LENGTH;
         slen = RSA_size(key->rsa);          slen = RSA_size(key->rsa);
         if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM)          if (slen <= 0 || slen > SSHBUF_MAX_BIGNUM)
                 return SSH_ERR_INVALID_ARGUMENT;                  return SSH_ERR_INVALID_ARGUMENT;
Line 167 
Line 168 
   
         if (key == NULL || key->rsa == NULL ||          if (key == NULL || key->rsa == NULL ||
             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 ||  
             sig == NULL || siglen == 0)              sig == NULL || siglen == 0)
                 return SSH_ERR_INVALID_ARGUMENT;                  return SSH_ERR_INVALID_ARGUMENT;
           if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE)
                   return SSH_ERR_KEY_LENGTH;
   
         if ((b = sshbuf_from(sig, siglen)) == NULL)          if ((b = sshbuf_from(sig, siglen)) == NULL)
                 return SSH_ERR_ALLOC_FAIL;                  return SSH_ERR_ALLOC_FAIL;
Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61