upstream commit

Make ssh_packet_set_rekey_limits take u32 for the number of
seconds until rekeying (negative values are rejected at config parse time).
This allows the removal of some casts and a signed vs unsigned comparison
warning.

rekey_time is cast to int64 for the comparison which is a no-op
on OpenBSD, but should also do the right thing in -portable on
anything still using 32bit time_t (until the system time actually
wraps, anyway).

some early guidance deraadt@, ok djm@

Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c

1 files changed, 2 insertions, 2 deletions

diff --git a/packet.h b/packet.h
index bfe7da615..c33dd17df 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.74 2016/10/11 21:47:45 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.75 2017/02/03 02:56:00 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -154,7 +154,7 @@ int	 ssh_remote_port(struct ssh *);
 const char *ssh_local_ipaddr(struct ssh *);
 int      ssh_local_port(struct ssh *);
 
-void     ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t);
+void     ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, u_int32_t);
 time_t   ssh_packet_get_rekey_timeout(struct ssh *);
 
 void    *ssh_packet_get_input(struct ssh *);