summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-06-15 10:30:09 +1000
committerDamien Miller <djm@mindrot.org>2004-06-15 10:30:09 +1000
commitf675fc4948b2ec2c9ff86bcdd58e00947f0e319b (patch)
treebabb42f0a29e7b24284a731cb894454d8f80fc97 /sshconnect2.c
parent7cf17eb78c71ba16ec39bb1a6a8640885071a307 (diff)
downloadopenssh-git-f675fc4948b2ec2c9ff86bcdd58e00947f0e319b.tar.gz
- djm@cvs.openbsd.org 2004/06/13 12:53:24
[dh.c dh.h kex.c kex.h kexdhc.c kexdhs.c monitor.c myproposal.h] [ssh-keyscan.c sshconnect2.c sshd.c] implement diffie-hellman-group14-sha1 kex method (trivial extension to existing diffie-hellman-group1-sha1); ok markus@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 06d88428..68d56d02 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.137 2004/05/08 00:21:31 djm Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.138 2004/06/13 12:53:24 djm Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -120,6 +120,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
/* start key exchange */
kex = kex_setup(myproposal);
kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
+ kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
kex->client_version_string=client_version_string;
kex->server_version_string=server_version_string;