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

Diff for /src/usr.bin/ssh/kex.c between version 1.141 and 1.142

version 1.141, 2018/07/09 13:37:10 version 1.142, 2018/12/07 03:39:40
Line 475 
Line 475 
         if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)          if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
                 return r;                  return r;
         kex->done = 1;          kex->done = 1;
           kex->flags &= ~KEX_INITIAL;
         sshbuf_reset(kex->peer);          sshbuf_reset(kex->peer);
         /* sshbuf_reset(kex->my); */          /* sshbuf_reset(kex->my); */
         kex->flags &= ~KEX_INIT_SENT;          kex->flags &= ~KEX_INIT_SENT;
Line 582 
Line 583 
         if ((r = kex_prop2buf(kex->my, proposal)) != 0)          if ((r = kex_prop2buf(kex->my, proposal)) != 0)
                 goto out;                  goto out;
         kex->done = 0;          kex->done = 0;
           kex->flags = KEX_INITIAL;
         kex_reset_dispatch(ssh);          kex_reset_dispatch(ssh);
         ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);          ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);
         r = 0;          r = 0;
Line 825 
Line 827 
         }          }
   
         /* Check whether client supports ext_info_c */          /* Check whether client supports ext_info_c */
         if (kex->server) {          if (kex->server && (kex->flags & KEX_INITIAL)) {
                 char *ext;                  char *ext;
   
                 ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL);                  ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL);
Legend:
Removed from v.1.141  
changed lines
  Added in v.1.142