commit 921ff00b0ac429666fb361d2d6cb1c8fff0006cb
author dtucker@openbsd.org <dtucker@openbsd.org> Fri Jan 29 02:54:45 2016 +0000
committer Damien Miller <djm@mindrot.org> Sat Jan 30 11:19:13 2016 +1100
tree 555f5a0348185ea84bdf43a298d8811390233cc7
parent c0060a65296f01d4634f274eee184c0e93ba0f23

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

sshd.c

diff --git a/sshd.c b/sshd.c
index 7504bff..253004d 100644
--- a/sshd.c
+++ b/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
@@ -2563,7 +2563,7 @@
 	}
 
 	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(