diff options
| author | Damien Miller <djm@mindrot.org> | 2004-06-15 02:30:09 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-06-15 02:30:09 +0200 |
| commit | f675fc4948b2ec2c9ff86bcdd58e00947f0e319b (patch) | |
| tree | babb42f0a29e7b24284a731cb894454d8f80fc97 /ssh-keyscan.c | |
| parent | - pedro@cvs.openbsd.org 2004/06/03 12:22:20 (diff) | |
| download | openssh-f675fc4948b2ec2c9ff86bcdd58e00947f0e319b.tar.xz openssh-f675fc4948b2ec2c9ff86bcdd58e00947f0e319b.zip | |
- 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@
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 266b23cb3..c4a2414b1 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.47 2004/03/08 09:38:05 djm Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.48 2004/06/13 12:53:24 djm Exp $"); #include "openbsd-compat/sys-queue.h" @@ -349,6 +349,7 @@ keygrab_ssh2(con *c) "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_GRP14_SHA1] = kexdh_client; c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; c->c_kex->verify_host_key = hostjump; |