[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.150 and 1.151

version 1.150, 2019/01/21 12:08:13 version 1.151, 2019/09/05 09:25:13
Line 398 
Line 398 
         int r;          int r;
         char *algs;          char *algs;
   
           debug("Sending SSH2_MSG_EXT_INFO");
         if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL)          if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL)
                 return SSH_ERR_ALLOC_FAIL;                  return SSH_ERR_ALLOC_FAIL;
         /* XXX filter algs list by allowed pubkey/hostbased types */          /* XXX filter algs list by allowed pubkey/hostbased types */
Line 424 
Line 425 
             (r = sshpkt_send(ssh)) != 0)              (r = sshpkt_send(ssh)) != 0)
                 return r;                  return r;
         debug("SSH2_MSG_NEWKEYS sent");          debug("SSH2_MSG_NEWKEYS sent");
         debug("expecting SSH2_MSG_NEWKEYS");  
         ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys);          ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys);
         if (ssh->kex->ext_info_c)          if (ssh->kex->ext_info_c && (ssh->kex->flags & KEX_INITIAL) != 0)
                 if ((r = kex_send_ext_info(ssh)) != 0)                  if ((r = kex_send_ext_info(ssh)) != 0)
                         return r;                          return r;
           debug("expecting SSH2_MSG_NEWKEYS");
         return 0;          return 0;
 }  }
   
Legend:
Removed from v.1.150  
changed lines
  Added in v.1.151