diff options
author | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:14 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-09-24 22:11:14 +1000 |
commit | d5f62bf280b0798d7009d4424594a648a4e887fb (patch) | |
tree | 5f18078ea61f6c5503dc4addfb2f17d13844692c /sshconnect2.c | |
parent | 603134e077e667b4819effb0e121803842df621f (diff) |
- djm@cvs.openbsd.org 2010/09/22 05:01:30
[kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h]
[servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5]
add a KexAlgorithms knob to the client and server configuration to allow
selection of which key exchange methods are used by ssh(1) and sshd(8)
and their order of preference.
ok markus@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index a31a663d4..6fe356cca 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.184 2010/08/31 11:54:45 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.185 2010/09/22 05:01:29 djm 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. |
@@ -135,6 +135,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
135 | if (options.hostkeyalgorithms != NULL) | 135 | if (options.hostkeyalgorithms != NULL) |
136 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = | 136 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
137 | options.hostkeyalgorithms; | 137 | options.hostkeyalgorithms; |
138 | if (options.kex_algorithms != NULL) | ||
139 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; | ||
138 | 140 | ||
139 | if (options.rekey_limit) | 141 | if (options.rekey_limit) |
140 | packet_set_rekey_limit((u_int32_t)options.rekey_limit); | 142 | packet_set_rekey_limit((u_int32_t)options.rekey_limit); |