diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-05-16 20:28:16 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-05-16 20:28:16 +1000 |
commit | c53c2af173cf67fd1c26f98e7900299b1b65b6ec (patch) | |
tree | 1c83d4abcdec31e4be6d8a2955fdad33b985b976 /sshconnect2.c | |
parent | 64c6fceecd27e1739040b42de8f3759454260b39 (diff) |
- dtucker@cvs.openbsd.org 2013/05/16 02:00:34
[ssh_config sshconnect2.c packet.c readconf.h readconf.c clientloop.c
ssh_config.5 packet.h]
Add an optional second argument to RekeyLimit in the client to allow
rekeying based on elapsed time in addition to amount of traffic.
with djm@ jmc@, ok djm
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index c01efe38c..7b83c591b 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.195 2013/05/10 03:40:07 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.196 2013/05/16 02:00:34 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -197,8 +197,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
197 | if (options.kex_algorithms != NULL) | 197 | if (options.kex_algorithms != NULL) |
198 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; | 198 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; |
199 | 199 | ||
200 | if (options.rekey_limit) | 200 | if (options.rekey_limit || options.rekey_interval) |
201 | packet_set_rekey_limit((u_int32_t)options.rekey_limit); | 201 | packet_set_rekey_limits((u_int32_t)options.rekey_limit, |
202 | (time_t)options.rekey_interval); | ||
202 | 203 | ||
203 | /* start key exchange */ | 204 | /* start key exchange */ |
204 | kex = kex_setup(myproposal); | 205 | kex = kex_setup(myproposal); |