commit f675fc4948b2ec2c9ff86bcdd58e00947f0e319b
author Damien Miller <djm@mindrot.org> Tue Jun 15 10:30:09 2004 +1000
committer Damien Miller <djm@mindrot.org> Tue Jun 15 10:30:09 2004 +1000
tree babb42f0a29e7b24284a731cb894454d8f80fc97
parent 7cf17eb78c71ba16ec39bb1a6a8640885071a307

   - 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@

sshd.c

diff --git a/sshd.c b/sshd.c
index 332a189..5f38781 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.291 2004/05/09 01:19:28 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.292 2004/06/13 12:53:24 djm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1774,6 +1774,7 @@
 	/* start key exchange */
 	kex = kex_setup(myproposal);
 	kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;
+	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server;
 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_server;
 	kex->server = 1;
 	kex->client_version_string=client_version_string;