summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 12:08:28 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 12:08:28 +1100
commita63128d1a8a4077bc992e09d00e2683d1592e500 (patch)
treed202bbd39fd539ff7173b196df0286636af49f2b /ssh-keyscan.c
parentcc3e8ba3c24357b912dd7071ba34ab863de593bd (diff)
- djm@cvs.openbsd.org 2006/03/07 09:07:40
[kex.c kex.h monitor.c myproposal.h ssh-keyscan.c sshconnect2.c sshd.c] 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 NB. no portability bits committed yet
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 13e7c721c..f05c4697c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
7 */ 7 */
8 8
9#include "includes.h" 9#include "includes.h"
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.59 2006/02/08 14:31:30 stevesk Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.60 2006/03/07 09:07:40 djm Exp $");
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13#include <sys/resource.h> 13#include <sys/resource.h>
@@ -351,6 +351,7 @@ keygrab_ssh2(con *c)
351 c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; 351 c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
352 c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; 352 c->c_kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
353 c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; 353 c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
354 c->c_kex->kex[KEX_DH_GEX_SHA256] = kexgex_client;
354 c->c_kex->verify_host_key = hostjump; 355 c->c_kex->verify_host_key = hostjump;
355 356
356 if (!(j = setjmp(kexjmp))) { 357 if (!(j = setjmp(kexjmp))) {