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

Diff for /src/usr.bin/ssh/monitor.c between version 1.146 and 1.147

version 1.146, 2015/04/17 04:32:31 version 1.147, 2015/04/27 01:52:30
Line 1518 
Line 1518 
   
         if ((kex = ssh->kex) != 0) {          if ((kex = ssh->kex) != 0) {
                 /* XXX set callbacks */                  /* XXX set callbacks */
   #ifdef WITH_OPENSSL
                 kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;                  kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
                 kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;                  kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
                 kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;                  kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
                 kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;                  kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
                 kex->kex[KEX_ECDH_SHA2] = kexecdh_server;                  kex->kex[KEX_ECDH_SHA2] = kexecdh_server;
   #endif
                 kex->kex[KEX_C25519_SHA256] = kexc25519_server;                  kex->kex[KEX_C25519_SHA256] = kexc25519_server;
                 kex->load_host_public_key=&get_hostkey_public_by_type;                  kex->load_host_public_key=&get_hostkey_public_by_type;
                 kex->load_host_private_key=&get_hostkey_private_by_type;                  kex->load_host_private_key=&get_hostkey_private_by_type;

Legend:
Removed from v.1.146  
changed lines
  Added in v.1.147