diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2016-01-29 02:54:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-01-30 11:19:13 +1100 |
commit | 921ff00b0ac429666fb361d2d6cb1c8fff0006cb (patch) | |
tree | 555f5a0348185ea84bdf43a298d8811390233cc7 /sshd.c | |
parent | c0060a65296f01d4634f274eee184c0e93ba0f23 (diff) |
upstream commit
Allow RekeyLimits in excess of 4G up to 2**63 bits
(limited by the return type of scan_scaled). Part of bz#2521, ok djm.
Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.463 2016/01/14 16:17:40 markus Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.464 2016/01/29 02:54:45 dtucker 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 |
@@ -2563,7 +2563,7 @@ do_ssh2_kex(void) | |||
2563 | } | 2563 | } |
2564 | 2564 | ||
2565 | if (options.rekey_limit || options.rekey_interval) | 2565 | if (options.rekey_limit || options.rekey_interval) |
2566 | packet_set_rekey_limits((u_int32_t)options.rekey_limit, | 2566 | packet_set_rekey_limits(options.rekey_limit, |
2567 | (time_t)options.rekey_interval); | 2567 | (time_t)options.rekey_interval); |
2568 | 2568 | ||
2569 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( | 2569 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( |