From 9de117ac3a8750788277dfd8585b7da80098a7b3 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Tue, 15 Jun 2004 00:30:09 +0000
Subject:    - 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@

---
 kexdhs.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'kexdhs.c')

diff --git a/kexdhs.c b/kexdhs.c
index f04bce82..225e6559 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kexdhs.c,v 1.1 2003/02/16 17:09:57 markus Exp $");
+RCSID("$OpenBSD: kexdhs.c,v 1.2 2004/06/13 12:53:24 djm Exp $");
 
 #include "xmalloc.h"
 #include "key.h"
@@ -45,7 +45,16 @@ kexdh_server(Kex *kex)
 	u_int slen;
 
 	/* generate server DH public key */
-	dh = dh_new_group1();
+	switch (kex->kex_type) {
+	case KEX_DH_GRP1_SHA1:
+		dh = dh_new_group1();
+		break;
+	case KEX_DH_GRP14_SHA1:
+		dh = dh_new_group14();
+		break;
+	default:
+		fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
+	}
 	dh_gen_key(dh, kex->we_need * 8);
 
 	debug("expecting SSH2_MSG_KEXDH_INIT");
-- 
cgit v1.2.1