[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.216 and 1.217

version 1.216, 2015/01/18 13:33:34 version 1.217, 2015/01/19 19:52:16
Line 85 
Line 85 
 char *xxx_host;  char *xxx_host;
 struct sockaddr *xxx_hostaddr;  struct sockaddr *xxx_hostaddr;
   
 Kex *xxx_kex = NULL;  
   
 static int  static int
 verify_host_key_callback(Key *hostkey)  verify_host_key_callback(Key *hostkey)
 {  {
Line 201 
Line 199 
   
         /* start key exchange */          /* start key exchange */
         kex = kex_setup(myproposal);          kex = kex_setup(myproposal);
           active_state->kex = kex;
 #ifdef WITH_OPENSSL  #ifdef WITH_OPENSSL
         kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;          kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;          kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
Line 212 
Line 211 
         kex->client_version_string=client_version_string;          kex->client_version_string=client_version_string;
         kex->server_version_string=server_version_string;          kex->server_version_string=server_version_string;
         kex->verify_host_key=&verify_host_key_callback;          kex->verify_host_key=&verify_host_key_callback;
   
         xxx_kex = kex;  
   
         dispatch_run(DISPATCH_BLOCK, &kex->done, kex);          dispatch_run(DISPATCH_BLOCK, &kex->done, kex);
   
Legend:
Removed from v.1.216  
changed lines
  Added in v.1.217