diff options
| author |   dtucker <dtucker@openbsd.org> | 2016-01-29 02:54:45 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2016-01-29 02:54:45 +0000 |
| commit | f4a3b94fd2e065f6365296faef4e1ab34d2359c3 (patch) | |
| tree | 3f0f52cdd14c0a9c0468b75b5966ecf0f147eb08 /usr.bin/ssh/sshd.c | |
| parent | Account for packets buffered but not yet processed when computing whether or (diff) | |
| download | wireguard-openbsd-f4a3b94fd2e065f6365296faef4e1ab34d2359c3.tar.xz wireguard-openbsd-f4a3b94fd2e065f6365296faef4e1ab34d2359c3.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 1253c80ddcf..f5c4442683e 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.463 2016/01/14 16:17:40 markus Exp $ */ +/* $OpenBSD: sshd.c,v 1.464 2016/01/29 02:54:45 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2386,7 +2386,7 @@ do_ssh2_kex(void) } if (options.rekey_limit || options.rekey_interval) - packet_set_rekey_limits((u_int32_t)options.rekey_limit, + packet_set_rekey_limits(options.rekey_limit, (time_t)options.rekey_interval); myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( |