src/usr.bin/ssh/sshconnect2.c - diff

Return to sshconnect2.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.282, 2018/07/18 11:34:04

version 1.283, 2018/07/31 03:07:24

Line 161

if ((s = kex_names_cat(options.kex_algorithms, "ext-info-c")) == NULL)

fatal("%s: kex_names_cat", __func__);

myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(s);

myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(s, datafellows);

myproposal[PROPOSAL_ENC_ALGS_CTOS] =

compat_cipher_proposal(options.ciphers);

compat_cipher_proposal(options.ciphers, datafellows);

myproposal[PROPOSAL_ENC_ALGS_STOC] =

compat_cipher_proposal(options.ciphers);

compat_cipher_proposal(options.ciphers, datafellows);

myproposal[PROPOSAL_COMP_ALGS_CTOS] =

myproposal[PROPOSAL_COMP_ALGS_STOC] = options.compression ?

"zlib@openssh.com,zlib,none" : "none,zlib@openssh.com,zlib";

Line 178

fatal("%s: kex_assemble_namelist", __func__);

free(all_key);

myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =

compat_pkalg_proposal(options.hostkeyalgorithms);

compat_pkalg_proposal(options.hostkeyalgorithms,

datafellows);

} else {

/* Enforce default */

options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);

/* Prefer algorithms that we already have keys for */

myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =

compat_pkalg_proposal(

order_hostkeyalgs(host, hostaddr, port));

order_hostkeyalgs(host, hostaddr, port), datafellows);

}

if (options.rekey_limit || options.rekey_interval)

Line 215

Line 216

/* remove ext-info from the KEX proposals for rekeying */

myproposal[PROPOSAL_KEX_ALGS] =

compat_kex_proposal(options.kex_algorithms);

compat_kex_proposal(options.kex_algorithms, datafellows);

if ((r = kex_prop2buf(kex->my, myproposal)) != 0)

fatal("kex_prop2buf: %s", ssh_err(r));