[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.196 and 1.197

version 1.196, 2019/01/21 10:29:56 version 1.197, 2019/01/21 10:38:54
Line 1381 
Line 1381 
         if ((kex = ssh->kex) != NULL) {          if ((kex = ssh->kex) != NULL) {
                 /* XXX set callbacks */                  /* XXX set callbacks */
 #ifdef WITH_OPENSSL  #ifdef WITH_OPENSSL
                 kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server;                  kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
                 kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server;                  kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
                 kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server;                  kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
                 kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server;                  kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
                 kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server;                  kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_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] = kex_kem_server;                  kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 #endif  #endif
                 kex->kex[KEX_C25519_SHA256] = kex_kem_server;                  kex->kex[KEX_C25519_SHA256] = kex_gen_server;
                 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server;                  kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_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;
                 kex->host_key_index=&get_hostkey_index;                  kex->host_key_index=&get_hostkey_index;

Legend:
Removed from v.1.196  
changed lines
  Added in v.1.197