version 1.225, 2015/07/10 06:21:53 |
version 1.226, 2015/07/30 00:01:34 |
|
|
xxx_host = host; |
xxx_host = host; |
xxx_hostaddr = hostaddr; |
xxx_hostaddr = hostaddr; |
|
|
if (options.ciphers == (char *)-1) { |
myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( |
logit("No valid ciphers for protocol version 2 given, using defaults."); |
options.kex_algorithms); |
options.ciphers = NULL; |
|
} |
|
if (options.ciphers != NULL) { |
|
myproposal[PROPOSAL_ENC_ALGS_CTOS] = |
|
myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; |
|
} |
|
myproposal[PROPOSAL_ENC_ALGS_CTOS] = |
myproposal[PROPOSAL_ENC_ALGS_CTOS] = |
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); |
compat_cipher_proposal(options.ciphers); |
myproposal[PROPOSAL_ENC_ALGS_STOC] = |
myproposal[PROPOSAL_ENC_ALGS_STOC] = |
compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); |
compat_cipher_proposal(options.ciphers); |
if (options.compression) { |
if (options.compression) { |
myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; |
myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; |
|
|
myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; |
myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; |
} |
} |
if (options.macs != NULL) { |
myproposal[PROPOSAL_MAC_ALGS_CTOS] = |
myproposal[PROPOSAL_MAC_ALGS_CTOS] = |
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; |
myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; |
if (options.hostkeyalgorithms != NULL) { |
} |
if (kex_assemble_names(KEX_DEFAULT_PK_ALG, |
if (options.hostkeyalgorithms != NULL) |
&options.hostkeyalgorithms) != 0) |
|
fatal("%s: kex_assemble_namelist", __func__); |
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
compat_pkalg_proposal(options.hostkeyalgorithms); |
compat_pkalg_proposal(options.hostkeyalgorithms); |
else { |
} else { |
/* Enforce default */ |
/* Enforce default */ |
options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); |
options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); |
/* Prefer algorithms that we already have keys for */ |
/* Prefer algorithms that we already have keys for */ |
|
|
compat_pkalg_proposal( |
compat_pkalg_proposal( |
order_hostkeyalgs(host, hostaddr, port)); |
order_hostkeyalgs(host, hostaddr, port)); |
} |
} |
if (options.kex_algorithms != NULL) |
|
myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; |
|
myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( |
|
myproposal[PROPOSAL_KEX_ALGS]); |
|
|
|
if (options.rekey_limit || options.rekey_interval) |
if (options.rekey_limit || options.rekey_interval) |
packet_set_rekey_limits((u_int32_t)options.rekey_limit, |
packet_set_rekey_limits((u_int32_t)options.rekey_limit, |