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@

kex.c

diff --git a/kex.c b/kex.c
index fa5de7e..cda8bf9 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.58 2004/05/09 01:26:48 djm Exp $");
+RCSID("$OpenBSD: kex.c,v 1.59 2004/06/13 12:53:24 djm Exp $");
 
 #include <openssl/crypto.h>
 
@@ -293,6 +293,8 @@
 		fatal("no kex alg");
 	if (strcmp(k->name, KEX_DH1) == 0) {
 		k->kex_type = KEX_DH_GRP1_SHA1;
+	} else if (strcmp(k->name, KEX_DH14) == 0) {
+		k->kex_type = KEX_DH_GRP14_SHA1;
 	} else if (strcmp(k->name, KEX_DHGEX) == 0) {
 		k->kex_type = KEX_DH_GEX_SHA1;
 	} else