diff options
author | djm <djm> | 2013-11-03 21:26:53 +0000 |
---|---|---|
committer | djm <djm> | 2013-11-03 21:26:53 +0000 |
commit | 493059bced949854d4e7a50c3c7ec87451db24c7 (patch) | |
tree | 844c695a84fafb509468849e232dd87763dd2604 /sshd.c | |
parent | 313140ccdb3713cc34585c3d50b86e3a1cb01283 (diff) | |
download | openssh-493059bced949854d4e7a50c3c7ec87451db24c7.tar.gz |
- 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 'sshd.c')
-rw-r--r-- | sshd.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.409 2013/10/23 23:35:32 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.410 2013/11/02 21:59:15 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2451,6 +2451,7 @@ do_ssh2_kex(void) kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; kex->kex[KEX_ECDH_SHA2] = kexecdh_server; + kex->kex[KEX_C25519_SHA256] = kexc25519_server; kex->server = 1; kex->client_version_string=client_version_string; kex->server_version_string=server_version_string; |