summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-02-08 10:57:07 +0000
committerDamien Miller <djm@mindrot.org>2016-02-08 21:58:32 +1100
commit19bcf2ea2d17413f2d9730dd2a19575ff86b9b6a (patch)
treea87286b290fcd540635890856fbcafef74341ec0 /packet.h
parent603ba41179e4b53951c7b90ee95b6ef3faa3f15d (diff)
upstream commit
refactor activation of rekeying This makes automatic rekeying internal to the packet code (previously the server and client loops needed to assist). In doing to it makes application of rekey limits more accurate by accounting for packets about to be sent as well as packets queued during rekeying events themselves. Based on a patch from dtucker@ which was in turn based on a patch Aleksander Adamowski in bz#2521; ok markus@ Upstream-ID: a441227fd64f9739850ca97b4cf794202860fcd8
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index 62302747d..28516a553 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.h,v 1.69 2016/01/29 02:54:45 dtucker Exp $ */ 1/* $OpenBSD: packet.h,v 1.70 2016/02/08 10:57:07 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -86,6 +86,7 @@ int ssh_packet_get_connection_in(struct ssh *);
86int ssh_packet_get_connection_out(struct ssh *); 86int ssh_packet_get_connection_out(struct ssh *);
87void ssh_packet_close(struct ssh *); 87void ssh_packet_close(struct ssh *);
88void ssh_packet_set_encryption_key(struct ssh *, const u_char *, u_int, int); 88void ssh_packet_set_encryption_key(struct ssh *, const u_char *, u_int, int);
89int ssh_packet_is_rekeying(struct ssh *);
89void ssh_packet_set_protocol_flags(struct ssh *, u_int); 90void ssh_packet_set_protocol_flags(struct ssh *, u_int);
90u_int ssh_packet_get_protocol_flags(struct ssh *); 91u_int ssh_packet_get_protocol_flags(struct ssh *);
91int ssh_packet_start_compression(struct ssh *, int); 92int ssh_packet_start_compression(struct ssh *, int);
@@ -145,7 +146,6 @@ int ssh_packet_set_state(struct ssh *, struct sshbuf *);
145const char *ssh_remote_ipaddr(struct ssh *); 146const char *ssh_remote_ipaddr(struct ssh *);
146int ssh_remote_port(struct ssh *); 147int ssh_remote_port(struct ssh *);
147 148
148int ssh_packet_need_rekeying(struct ssh *);
149void ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t); 149void ssh_packet_set_rekey_limits(struct ssh *, u_int64_t, time_t);
150time_t ssh_packet_get_rekey_timeout(struct ssh *); 150time_t ssh_packet_get_rekey_timeout(struct ssh *);
151 151