diff options
author | des <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
commit | b0cdf22191013178c7694637560137915289f816 (patch) | |
tree | dc2c261fdeb1a1f5f118d61796660764d36ca826 /crypto/openssh/kexdhc.c | |
parent | 8f7bf32c3425ea16db5bcd8d80ec43127389066c (diff) | |
parent | d5d493f03ae792146848e3cba16bb9e667c73125 (diff) | |
download | FreeBSD-src-b0cdf22191013178c7694637560137915289f816.zip FreeBSD-src-b0cdf22191013178c7694637560137915289f816.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r137015,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssh/kexdhc.c')
-rw-r--r-- | crypto/openssh/kexdhc.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/crypto/openssh/kexdhc.c b/crypto/openssh/kexdhc.c index fe6dc53..f48bd46 100644 --- a/crypto/openssh/kexdhc.c +++ b/crypto/openssh/kexdhc.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexdhc.c,v 1.1 2003/02/16 17:09:57 markus Exp $"); +RCSID("$OpenBSD: kexdhc.c,v 1.2 2004/06/13 12:53:24 djm Exp $"); #include "xmalloc.h" #include "key.h" @@ -44,7 +44,16 @@ kexdh_client(Kex *kex) u_int klen, kout, slen, sbloblen; /* generate and send 'e', client 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); packet_start(SSH2_MSG_KEXDH_INIT); packet_put_bignum2(dh->pub_key); |