diff options
author | Damien Miller <djm@mindrot.org> | 2003-04-09 20:50:06 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-04-09 20:50:06 +1000 |
commit | a5539d2698ea83b4a7f9abe7cde8306e2fd76f33 (patch) | |
tree | cd95d1bf54f7496bc080a981bc55300f083939f4 /sshconnect2.c | |
parent | a92a589e9716d6b10250c3eb8f4d81d64cd60dd8 (diff) |
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/04/02 09:48:07
[clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
[readconf.h serverloop.c sshconnect2.c]
reapply rekeying chage, tested by henning@, ok djm@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 642b34b9e..41768bf05 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.114 2003/04/01 10:22:21 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.115 2003/04/02 09:48:07 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh.h" | 28 | #include "ssh.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -108,6 +108,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
108 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = | 108 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
109 | options.hostkeyalgorithms; | 109 | options.hostkeyalgorithms; |
110 | 110 | ||
111 | if (options.rekey_limit) | ||
112 | packet_set_rekey_limit(options.rekey_limit); | ||
113 | |||
111 | /* start key exchange */ | 114 | /* start key exchange */ |
112 | kex = kex_setup(myproposal); | 115 | kex = kex_setup(myproposal); |
113 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 116 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |