diff options
| author | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | 58b9db3b6f971290d3f183595398923fba625338 (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/ssh-keyscan.c | |
| parent | 6d34992e86f885f08b7df6e18a0b6af25ec2d664 (diff) | |
| download | FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.zip FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh-keyscan.c')
| -rw-r--r-- | crypto/openssh/ssh-keyscan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c index fb5ca7f..bd8fcf5 100644 --- a/crypto/openssh/ssh-keyscan.c +++ b/crypto/openssh/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.40 2002/07/06 17:47:58 stevesk Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.41 2003/02/16 17:09:57 markus Exp $"); RCSID("$FreeBSD$"); #include "openbsd-compat/sys-queue.h" @@ -355,6 +355,8 @@ keygrab_ssh2(con *c) myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = c->c_keytype == KT_DSA? "ssh-dss": "ssh-rsa"; c->c_kex = kex_setup(myproposal); + c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; + c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; c->c_kex->verify_host_key = hostjump; if (!(j = setjmp(kexjmp))) { |
