merge 6.3p1

1 files changed, 4 insertions, 3 deletions

diff --git a/packet.h b/packet.h
index 09ba07951..f8edf851c 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.57 2012/01/25 19:40:09 markus Exp $ */
+/* $OpenBSD: packet.h,v 1.59 2013/07/12 00:19:59 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -71,7 +71,7 @@ void	*packet_get_raw(u_int *length_ptr);
 void    *packet_get_string(u_int *length_ptr);
 char    *packet_get_cstring(u_int *length_ptr);
 void    *packet_get_string_ptr(u_int *length_ptr);
-void     packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
+void     packet_disconnect(const char *fmt,...) __attribute__((noreturn)) __attribute__((format(printf, 1, 2)));
 void     packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
 
 void     set_newkeys(int mode);
@@ -115,7 +115,8 @@ do { \
 } while (0)
 
 int      packet_need_rekeying(void);
-void     packet_set_rekey_limit(u_int32_t);
+void     packet_set_rekey_limits(u_int32_t, time_t);
+time_t   packet_get_rekey_timeout(void);
 
 void     packet_backup_state(void);
 void     packet_restore_state(void);