diff options
| author |   djm <djm@openbsd.org> | 2010-09-22 05:01:29 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-09-22 05:01:29 +0000 |
| commit | fcae0388a3a8b1dc7667b3ad6cefa8b2508c2712 (patch) | |
| tree | 793819f9ad2fd310ebe078ebb8d5f3af76e62b0b /usr.bin/ssh/sshconnect2.c | |
| parent | Fix a locking bug in accept(2) caught by sthen@ using my strict (diff) | |
| download | wireguard-openbsd-fcae0388a3a8b1dc7667b3ad6cefa8b2508c2712.tar.xz wireguard-openbsd-fcae0388a3a8b1dc7667b3ad6cefa8b2508c2712.zip | |
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 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index bfb97b3d9fb..8b7db3a17c6 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.184 2010/08/31 11:54:45 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.185 2010/09/22 05:01:29 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -129,6 +129,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) if (options.hostkeyalgorithms != NULL) myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = options.hostkeyalgorithms; + if (options.kex_algorithms != NULL) + myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; if (options.rekey_limit) packet_set_rekey_limit((u_int32_t)options.rekey_limit); |