[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.130 and 1.131

version 1.130, 2017/03/10 04:07:20 version 1.131, 2017/03/15 07:07:39
Line 321 
Line 321 
 {  {
         ssh_dispatch_range(ssh, SSH2_MSG_TRANSPORT_MIN,          ssh_dispatch_range(ssh, SSH2_MSG_TRANSPORT_MIN,
             SSH2_MSG_TRANSPORT_MAX, &kex_protocol_error);              SSH2_MSG_TRANSPORT_MAX, &kex_protocol_error);
         ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);  
 }  }
   
 static int  static int
Line 411 
Line 410 
   
         debug("SSH2_MSG_NEWKEYS received");          debug("SSH2_MSG_NEWKEYS received");
         ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);          ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error);
           ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);
         if ((r = sshpkt_get_end(ssh)) != 0)          if ((r = sshpkt_get_end(ssh)) != 0)
                 return r;                  return r;
         if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)          if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0)
Line 525 
Line 525 
                 goto out;                  goto out;
         kex->done = 0;          kex->done = 0;
         kex_reset_dispatch(ssh);          kex_reset_dispatch(ssh);
           ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, &kex_input_kexinit);
         r = 0;          r = 0;
         *kexp = kex;          *kexp = kex;
  out:   out:
Legend:
Removed from v.1.130  
changed lines
  Added in v.1.131