diff options
| author |   djm <djm@openbsd.org> | 2006-03-07 09:07:39 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-03-07 09:07:39 +0000 |
| commit | abd430862523021f8ef735f8b8ea0c979261c591 (patch) | |
| tree | 712b77925803ed98f97698efe3adcb867fe057e2 /usr.bin/ssh/ssh-keyscan.c | |
| parent | Fix NULL deref when doing `lint --'. (diff) | |
| download | wireguard-openbsd-abd430862523021f8ef735f8b8ea0c979261c591.tar.xz wireguard-openbsd-abd430862523021f8ef735f8b8ea0c979261c591.zip | |
Implement the diffie-hellman-group-exchange-sha256 key exchange method
using the SHA256 code in libc (and wrapper to make it into an OpenSSL
EVP), interop tested against CVS PuTTY
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 2fd3a82cb05..7845c4326a4 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.59 2006/02/08 14:31:30 stevesk Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.60 2006/03/07 09:07:40 djm Exp $"); #include <sys/queue.h> #include <sys/resource.h> @@ -343,6 +343,7 @@ keygrab_ssh2(con *c) 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->kex[KEX_DH_GEX_SHA256] = kexgex_client; c->c_kex->verify_host_key = hostjump; if (!(j = setjmp(kexjmp))) { |