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

Diff for /src/usr.bin/ssh/sshkey.c between version 1.46 and 1.47

version 1.46, 2017/04/30 23:10:43 version 1.47, 2017/04/30 23:15:04
Line 2921 
Line 2921 
                 kdfname = "none";                  kdfname = "none";
         } else if (ciphername == NULL)          } else if (ciphername == NULL)
                 ciphername = DEFAULT_CIPHERNAME;                  ciphername = DEFAULT_CIPHERNAME;
         else if (cipher_number(ciphername) != SSH_CIPHER_SSH2) {  
                 r = SSH_ERR_INVALID_ARGUMENT;  
                 goto out;  
         }  
         if ((cipher = cipher_by_name(ciphername)) == NULL) {          if ((cipher = cipher_by_name(ciphername)) == NULL) {
                 r = SSH_ERR_INTERNAL_ERROR;                  r = SSH_ERR_INVALID_ARGUMENT;
                 goto out;                  goto out;
         }          }
   
Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47