diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-22 17:52:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-24 05:39:37 +1000 |
commit | 0493766d5676c7ca358824ea8d3c90f6047953df (patch) | |
tree | 43d2bee12148323d07bf83f9e2a30c4caf637a71 /kex.c | |
parent | f31c654b30a6f02ce0b8ea8ab81791b675489628 (diff) |
upstream commit
support plain curve25519-sha256 KEX algorithm now that it
is approaching standardisation (same algorithm is currently supported as
curve25519-sha256@libssh.org)
Upstream-ID: 5e2b6db2e72667048cf426da43c0ee3fc777baa2
Diffstat (limited to 'kex.c')
-rw-r--r-- | kex.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.123 2016/09/21 19:53:12 djm Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.124 2016/09/22 17:52:53 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -109,6 +109,7 @@ static const struct kexalg kexalgs[] = { | |||
109 | #endif /* WITH_OPENSSL */ | 109 | #endif /* WITH_OPENSSL */ |
110 | #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL) | 110 | #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL) |
111 | { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, | 111 | { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, |
112 | { KEX_CURVE25519_SHA256_OLD, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, | ||
112 | #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */ | 113 | #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */ |
113 | { NULL, -1, -1, -1}, | 114 | { NULL, -1, -1, -1}, |
114 | }; | 115 | }; |