diff options
| author |   markus <markus@openbsd.org> | 2013-11-02 21:59:15 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2013-11-02 21:59:15 +0000 |
| commit | 53ee5feaa847990fb0042601bcaa1c2d32c6b316 (patch) | |
| tree | e47364ec0faf7c16bcb5cd8fbeeb6f3f5c9032ef /usr.bin/ssh/sshconnect2.c | |
| parent | Oops, utime() is section 3, not 2 (diff) | |
| download | wireguard-openbsd-53ee5feaa847990fb0042601bcaa1c2d32c6b316.tar.xz wireguard-openbsd-53ee5feaa847990fb0042601bcaa1c2d32c6b316.zip | |
use curve25519 for default key exchange (curve25519-sha256@libssh.org);
initial patch from Aris Adamantiadis; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index a5e621ea81b..1572fe457f6 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/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. @@ -202,6 +202,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; |