summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index f0fc07896..3ca722c5c 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.423 2014/04/12 04:55:53 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.424 2014/04/18 23:52:25 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2438,6 +2438,9 @@ do_ssh2_kex(void)
2438 if (options.kex_algorithms != NULL) 2438 if (options.kex_algorithms != NULL)
2439 myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; 2439 myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;
2440 2440
2441 myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(
2442 myproposal[PROPOSAL_KEX_ALGS]);
2443
2441 if (options.rekey_limit || options.rekey_interval) 2444 if (options.rekey_limit || options.rekey_interval)
2442 packet_set_rekey_limits((u_int32_t)options.rekey_limit, 2445 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
2443 (time_t)options.rekey_interval); 2446 (time_t)options.rekey_interval);