4 files changed, 12 insertions, 12 deletions

diff --git a/packet.c b/packet.c
index ad1f6b497..6b9d3525b 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.243 2016/10/11 21:47:45 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.244 2017/02/03 02:56:00 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1049,7 +1049,7 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
 
         /* Time-based rekeying */
         if (state->rekey_interval != 0 &&
-            state->rekey_time + state->rekey_interval <= monotime())
+            (int64_t)state->rekey_time + state->rekey_interval <= monotime())
                 return 1;
 
         /* Always rekey when MAX_PACKETS sent in either direction */
@@ -2396,10 +2396,10 @@ ssh_packet_send_ignore(struct ssh *ssh, int nbytes)
 }
 
 void
-ssh_packet_set_rekey_limits(struct ssh *ssh, u_int64_t bytes, time_t seconds)
+ssh_packet_set_rekey_limits(struct ssh *ssh, u_int64_t bytes, u_int32_t seconds)
 {
-        debug3("rekey after %llu bytes, %d seconds", (unsigned long long)bytes,
-            (int)seconds);
+        debug3("rekey after %llu bytes, %u seconds", (unsigned long long)bytes,
+            (unsigned int)seconds);
         ssh->state->rekey_limit = bytes;
         ssh->state->rekey_interval = seconds;
 }
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 *);
diff --git a/sshconnect2.c b/sshconnect2.c
index dd47b75d3..2abb86679 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.253 2017/01/30 00:32:28 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.254 2017/02/03 02:56:00 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -193,8 +193,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
         }
 
         if (options.rekey_limit || options.rekey_interval)
-                packet_set_rekey_limits((u_int32_t)options.rekey_limit,
-                    (time_t)options.rekey_interval);
+                packet_set_rekey_limits(options.rekey_limit,
+                    options.rekey_interval);
 
         /* start key exchange */
         if ((r = kex_setup(active_state, myproposal)) != 0)
diff --git a/sshd.c b/sshd.c
index 1dc4d182a..48fd64f3d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.480 2016/12/09 03:04:29 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.481 2017/02/03 02:56:00 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2154,7 +2154,7 @@ do_ssh2_kex(void)
 
         if (options.rekey_limit || options.rekey_interval)
                 packet_set_rekey_limits(options.rekey_limit,
-                    (time_t)options.rekey_interval);
+                    options.rekey_interval);
 
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
             list_hostkey_types());