diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-04 08:26:52 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-04 08:26:52 +1100 |
| commit | 1e1242604eb0fd510fe93f81245c529237ffc513 (patch) | |
| tree | d15eb5e9442cd3d812d6ade20775864f1600825a /sshconnect2.c | |
| parent | d2252c79191d069372ed6effce7c7a2de93448cd (diff) | |
| download | openssh-git-1e1242604eb0fd510fe93f81245c529237ffc513.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 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 70e3cd8c..1f6160e8 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.198 2013/06/05 12:52:38 dtucker Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.199 2013/11/02 21:59:15 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -208,6 +208,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; kex->kex[KEX_ECDH_SHA2] = kexecdh_client; + kex->kex[KEX_C25519_SHA256] = kexc25519_client; kex->client_version_string=client_version_string; kex->server_version_string=server_version_string; kex->verify_host_key=&verify_host_key_callback; |