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

Diff for /src/usr.bin/ssh/monitor.c between version 1.175 and 1.176

version 1.175, 2017/10/05 15:52:03 version 1.176, 2017/12/18 02:25:15
Line 1048 
Line 1048 
 {  {
         struct sshkey *key;          struct sshkey *key;
         u_char *signature, *data, *blob;          u_char *signature, *data, *blob;
           char *sigalg;
         size_t signaturelen, datalen, bloblen;          size_t signaturelen, datalen, bloblen;
         int r, ret, valid_data = 0, encoded_ret;          int r, ret, valid_data = 0, encoded_ret;
   
         if ((r = sshbuf_get_string(m, &blob, &bloblen)) != 0 ||          if ((r = sshbuf_get_string(m, &blob, &bloblen)) != 0 ||
             (r = sshbuf_get_string(m, &signature, &signaturelen)) != 0 ||              (r = sshbuf_get_string(m, &signature, &signaturelen)) != 0 ||
             (r = sshbuf_get_string(m, &data, &datalen)) != 0)              (r = sshbuf_get_string(m, &data, &datalen)) != 0 ||
               (r = sshbuf_get_cstring(m, &sigalg, NULL)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));                  fatal("%s: buffer error: %s", __func__, ssh_err(r));
   
         if (hostbased_cuser == NULL || hostbased_chost == NULL ||          if (hostbased_cuser == NULL || hostbased_chost == NULL ||
Line 1082 
Line 1084 
                 fatal("%s: bad signature data blob", __func__);                  fatal("%s: bad signature data blob", __func__);
   
         ret = sshkey_verify(key, signature, signaturelen, data, datalen,          ret = sshkey_verify(key, signature, signaturelen, data, datalen,
             active_state->compat);              sigalg, active_state->compat);
         debug3("%s: %s %p signature %s", __func__, auth_method, key,          debug3("%s: %s %p signature %s", __func__, auth_method, key,
             (ret == 0) ? "verified" : "unverified");              (ret == 0) ? "verified" : "unverified");
         auth2_record_key(authctxt, ret == 0, key);          auth2_record_key(authctxt, ret == 0, key);

Legend:
Removed from v.1.175  
changed lines
  Added in v.1.176