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

Diff for /src/usr.bin/ssh/ssh_api.c between version 1.14 and 1.15

version 1.14, 2019/01/21 10:29:56 version 1.15, 2019/01/21 10:38:54
Line 95 
Line 95 
         ssh->kex->server = is_server;          ssh->kex->server = is_server;
         if (is_server) {          if (is_server) {
 #ifdef WITH_OPENSSL  #ifdef WITH_OPENSSL
                 ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server;                  ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server;                  ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server;                  ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server;                  ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server;                  ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server;
                 ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;                  ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
                 ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;                  ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server;
                 ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_server;                  ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
 #endif /* WITH_OPENSSL */  #endif /* WITH_OPENSSL */
                 ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_server;                  ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_server;
                 ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_server;                  ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
                 ssh->kex->load_host_public_key=&_ssh_host_public_key;                  ssh->kex->load_host_public_key=&_ssh_host_public_key;
                 ssh->kex->load_host_private_key=&_ssh_host_private_key;                  ssh->kex->load_host_private_key=&_ssh_host_private_key;
                 ssh->kex->sign=&_ssh_host_key_sign;                  ssh->kex->sign=&_ssh_host_key_sign;
         } else {          } else {
 #ifdef WITH_OPENSSL  #ifdef WITH_OPENSSL
                 ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client;                  ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_client;
                 ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client;                  ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_client;
                 ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client;                  ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_client;
                 ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client;                  ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_client;
                 ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client;                  ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_client;
                 ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;                  ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
                 ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;                  ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
                 ssh->kex->kex[KEX_ECDH_SHA2] = kex_kem_client;                  ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
 #endif /* WITH_OPENSSL */  #endif /* WITH_OPENSSL */
                 ssh->kex->kex[KEX_C25519_SHA256] = kex_kem_client;                  ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client;
                 ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_kem_client;                  ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_client;
                 ssh->kex->verify_host_key =&_ssh_verify_host_key;                  ssh->kex->verify_host_key =&_ssh_verify_host_key;
         }          }
         *sshp = ssh;          *sshp = ssh;

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15