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 /packet.h | |
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 'packet.h')
-rw-r--r-- | packet.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.h,v 1.68 2016/01/14 16:17:40 markus Exp $ */ | 1 | /* $OpenBSD: packet.h,v 1.69 2016/01/29 02:54:45 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -146,7 +146,7 @@ const char *ssh_remote_ipaddr(struct ssh *); | |||
146 | int ssh_remote_port(struct ssh *); | 146 | int ssh_remote_port(struct ssh *); |
147 | 147 | ||
148 | int ssh_packet_need_rekeying(struct ssh *); | 148 | int ssh_packet_need_rekeying(struct ssh *); |
149 | void ssh_packet_set_rekey_limits(struct ssh *, u_int32_t, time_t); | 149 | void ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t); |
150 | time_t ssh_packet_get_rekey_timeout(struct ssh *); | 150 | time_t ssh_packet_get_rekey_timeout(struct ssh *); |
151 | 151 | ||
152 | void *ssh_packet_get_input(struct ssh *); | 152 | void *ssh_packet_get_input(struct ssh *); |