[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.204.4.1 and 1.205

version 1.204.4.1, 2014/04/21 00:30:48 version 1.205, 2014/03/27 23:01:27
Line 150 
Line 150 
 void  void
 ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)  ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
 {  {
           char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };
         Kex *kex;          Kex *kex;
   
         xxx_host = host;          xxx_host = host;
Line 189 
Line 190 
         }          }
         if (options.kex_algorithms != NULL)          if (options.kex_algorithms != NULL)
                 myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;                  myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
         myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(  
             myproposal[PROPOSAL_KEX_ALGS]);  
   
         if (options.rekey_limit || options.rekey_interval)          if (options.rekey_limit || options.rekey_interval)
                 packet_set_rekey_limits((u_int32_t)options.rekey_limit,                  packet_set_rekey_limits((u_int32_t)options.rekey_limit,
Legend:
Removed from v.1.204.4.1  
changed lines
  Added in v.1.205