Import of OpenSSH 3.9p1

[gssapi-openssh.git] / openssh / kexdhs.c

diff --git a/openssh/kexdhs.c b/openssh/kexdhs.c
index f04bce8255c92dc35204a88e051c077273414ff6..225e655926ca4f49a8dd22640d39834e37c7ce9b 100644 (file)
--- a/openssh/kexdhs.c
+++ b/openssh/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");