summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-04-21 21:24:52 +0100
committerColin Watson <cjwatson@debian.org>2014-04-21 21:28:19 +0100
commit7cc2be72098d7b3384daf09d85d9969d9da0420e (patch)
treec762cfc9b928dc4b8dc41399308e3552b1e6a5ca /sshd.c
parentc730d55d220e15fb7bc6b9b56633541e97817175 (diff)
parent02883061577ec43ff8d0e8f0cf486bc5131db507 (diff)
Apply upstream-recommended patch to fix bignum encoding for curve25519-sha256@libssh.org, fixing occasional key exchange failures.
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sshd.c b/sshd.c
index 09644914c..fe78d7b66 100644
--- a/sshd.c
+++ b/sshd.c
@@ -2534,6 +2534,9 @@ do_ssh2_kex(void)
2534 if (options.kex_algorithms != NULL) 2534 if (options.kex_algorithms != NULL)
2535 myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; 2535 myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
2536 2536
2537 myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
2538 myproposal[PROPOSAL_KEX_ALGS]);
2539
2537 if (options.rekey_limit || options.rekey_interval) 2540 if (options.rekey_limit || options.rekey_interval)
2538 packet_set_rekey_limits((u_int32_t)options.rekey_limit, 2541 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
2539 (time_t)options.rekey_interval); 2542 (time_t)options.rekey_interval);