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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.238 and 1.239

version 1.238, 2016/02/05 04:31:21 version 1.239, 2016/02/23 01:34:14
Line 1031 
Line 1031 
                     compat));                      compat));
         /* load the private key from the file */          /* load the private key from the file */
         if ((prv = load_identity_file(id)) == NULL)          if ((prv = load_identity_file(id)) == NULL)
                 return (-1); /* XXX return decent error code */                  return SSH_ERR_KEY_NOT_FOUND;
         ret = sshkey_sign(prv, sigp, lenp, data, datalen, alg, compat);          ret = sshkey_sign(prv, sigp, lenp, data, datalen, alg, compat);
         sshkey_free(prv);          sshkey_free(prv);
         return (ret);          return (ret);
Line 1117 
Line 1117 
         ret = identity_sign(id, &signature, &slen,          ret = identity_sign(id, &signature, &slen,
             buffer_ptr(&b), buffer_len(&b), datafellows);              buffer_ptr(&b), buffer_len(&b), datafellows);
         if (ret != 0) {          if (ret != 0) {
                 error("%s: signing failed: %s", __func__, ssh_err(ret));                  if (ret != SSH_ERR_KEY_NOT_FOUND)
                           error("%s: signing failed: %s", __func__, ssh_err(ret));
                 free(blob);                  free(blob);
                 buffer_free(&b);                  buffer_free(&b);
                 return 0;                  return 0;
Legend:
Removed from v.1.238  
changed lines
  Added in v.1.239