diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-07-16 09:00:23 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-07-16 19:21:04 +1000 |
| commit | 073f45c236550f158c9a94003e4611c07dea5279 (patch) | |
| tree | 28b6063b16e538dedb76516ba6db5fd5e6ae2d98 /packet.h | |
| parent | ef7c4e52d5d840607f9ca3a302a4cbb81053eccf (diff) | |
| download | openssh-git-073f45c236550f158c9a94003e4611c07dea5279.tar.gz | |
upstream: Explicitly check for and start time-based rekeying in the
client and server mainloops.
Previously the rekey timeout could expire but rekeying would not start
until a packet was sent or received. This could cause us to spin in
select() on the rekey timeout if the connection was quiet.
ok markus@
OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
Diffstat (limited to 'packet.h')
| -rw-r--r-- | packet.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.h,v 1.92 2020/03/06 18:11:10 markus Exp $ */ +/* $OpenBSD: packet.h,v 1.93 2021/07/16 09:00:23 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -105,6 +105,7 @@ void ssh_packet_clear_keys(struct ssh *); void ssh_clear_newkeys(struct ssh *, int); int ssh_packet_is_rekeying(struct ssh *); +int ssh_packet_check_rekey(struct ssh *); void ssh_packet_set_protocol_flags(struct ssh *, u_int); u_int ssh_packet_get_protocol_flags(struct ssh *); void ssh_packet_set_tos(struct ssh *, int); |