diff options
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.243 2016/10/11 21:47:45 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.244 2017/02/03 02:56:00 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
1049 | 1049 | ||
1050 | /* Time-based rekeying */ | 1050 | /* Time-based rekeying */ |
1051 | if (state->rekey_interval != 0 && | 1051 | if (state->rekey_interval != 0 && |
1052 | state->rekey_time + state->rekey_interval <= monotime()) | 1052 | (int64_t)state->rekey_time + state->rekey_interval <= monotime()) |
1053 | return 1; | 1053 | return 1; |
1054 | 1054 | ||
1055 | /* Always rekey when MAX_PACKETS sent in either direction */ | 1055 | /* Always rekey when MAX_PACKETS sent in either direction */ |
@@ -2396,10 +2396,10 @@ ssh_packet_send_ignore(struct ssh *ssh, int nbytes) | |||
2396 | } | 2396 | } |
2397 | 2397 | ||
2398 | void | 2398 | void |
2399 | ssh_packet_set_rekey_limits(struct ssh *ssh, u_int64_t bytes, time_t seconds) | 2399 | ssh_packet_set_rekey_limits(struct ssh *ssh, u_int64_t bytes, u_int32_t seconds) |
2400 | { | 2400 | { |
2401 | debug3("rekey after %llu bytes, %d seconds", (unsigned long long)bytes, | 2401 | debug3("rekey after %llu bytes, %u seconds", (unsigned long long)bytes, |
2402 | (int)seconds); | 2402 | (unsigned int)seconds); |
2403 | ssh->state->rekey_limit = bytes; | 2403 | ssh->state->rekey_limit = bytes; |
2404 | ssh->state->rekey_interval = seconds; | 2404 | ssh->state->rekey_interval = seconds; |
2405 | } | 2405 | } |