diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-02-03 02:56:00 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-02-03 14:34:25 +1100 |
commit | c998bf0afa1a01257a53793eba57941182e9e0b7 (patch) | |
tree | ac760850c4433e2bcde4a91acc9a1d22796c6a11 /sshd.c | |
parent | 3ec5fa4ba97d4c4853620daea26a33b9f1fe3422 (diff) |
upstream commit
Make ssh_packet_set_rekey_limits take u32 for the number of
seconds until rekeying (negative values are rejected at config parse time).
This allows the removal of some casts and a signed vs unsigned comparison
warning.
rekey_time is cast to int64 for the comparison which is a no-op
on OpenBSD, but should also do the right thing in -portable on
anything still using 32bit time_t (until the system time actually
wraps, anyway).
some early guidance deraadt@, ok djm@
Upstream-ID: c9f18613afb994a07e7622eb326f49de3d123b6c
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.480 2016/12/09 03:04:29 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.481 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 |
@@ -2154,7 +2154,7 @@ do_ssh2_kex(void) | |||
2154 | 2154 | ||
2155 | if (options.rekey_limit || options.rekey_interval) | 2155 | if (options.rekey_limit || options.rekey_interval) |
2156 | packet_set_rekey_limits(options.rekey_limit, | 2156 | packet_set_rekey_limits(options.rekey_limit, |
2157 | (time_t)options.rekey_interval); | 2157 | options.rekey_interval); |
2158 | 2158 | ||
2159 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( | 2159 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( |
2160 | list_hostkey_types()); | 2160 | list_hostkey_types()); |