diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-03 22:26:52 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-03 22:26:52 +0100 |
| commit | 1e1242604eb0fd510fe93f81245c529237ffc513 (patch) | |
| tree | d15eb5e9442cd3d812d6ade20775864f1600825a /ssh-keyscan.c | |
| parent | - markus@cvs.openbsd.org 2013/11/02 20:03:54 (diff) | |
| download | openssh-1e1242604eb0fd510fe93f81245c529237ffc513.tar.xz openssh-1e1242604eb0fd510fe93f81245c529237ffc513.zip | |
- markus@cvs.openbsd.org 2013/11/02 21:59:15
[kex.c kex.h myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
use curve25519 for default key exchange (curve25519-sha256@libssh.org);
initial patch from Aris Adamantiadis; ok djm@
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 8b807c10a..c5f658d77 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.87 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.88 2013/11/02 21:59:15 markus Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -254,6 +254,7 @@ keygrab_ssh2(con *c) c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; c->c_kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; c->c_kex->kex[KEX_ECDH_SHA2] = kexecdh_client; + c->c_kex->kex[KEX_C25519_SHA256] = kexc25519_client; c->c_kex->verify_host_key = hostjump; if (!(j = setjmp(kexjmp))) { |