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 /kex.c | |
| parent | d2252c79191d069372ed6effce7c7a2de93448cd (diff) | |
- 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 'kex.c')
| -rw-r--r-- | kex.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.91 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.92 2013/11/02 21:59:15 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -80,6 +80,7 @@ static const struct kexalg kexalgs[] = { { KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1, EVP_sha384 }, { KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1, EVP_sha512 }, #endif + { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, EVP_sha256 }, { NULL, -1, -1, NULL}, }; |