diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-05-16 20:29:28 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-05-16 20:29:28 +1000 |
commit | 5f96f3b4bee11ae2b9b32ff9b881c3693e210f96 (patch) | |
tree | 1e1c647e73e447b06b194b38b5d39e95aec8bef9 /sshd.c | |
parent | c53c2af173cf67fd1c26f98e7900299b1b65b6ec (diff) |
- dtucker@cvs.openbsd.org 2013/05/16 04:09:14
[sshd_config.5 servconf.c servconf.h packet.c serverloop.c monitor.c sshd_config
sshd.c] Add RekeyLimit to sshd with the same syntax as the client allowing
rekeying based on traffic volume or time. ok djm@, help & ok jmc@ for the man
page.
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.399 2013/04/07 02:10:33 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.400 2013/05/16 04:09:14 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 |
@@ -2364,6 +2364,10 @@ do_ssh2_kex(void) | |||
2364 | if (options.kex_algorithms != NULL) | 2364 | if (options.kex_algorithms != NULL) |
2365 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; | 2365 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; |
2366 | 2366 | ||
2367 | if (options.rekey_limit || options.rekey_interval) | ||
2368 | packet_set_rekey_limits((u_int32_t)options.rekey_limit, | ||
2369 | (time_t)options.rekey_interval); | ||
2370 | |||
2367 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); | 2371 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); |
2368 | 2372 | ||
2369 | /* start key exchange */ | 2373 | /* start key exchange */ |