From 0493766d5676c7ca358824ea8d3c90f6047953df Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 22 Sep 2016 17:52:53 +0000 Subject: 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 --- kex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kex.c') diff --git a/kex.c b/kex.c index edb61bee7..811e2cf6c 100644 --- a/kex.c +++ b/kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.c,v 1.123 2016/09/21 19:53:12 djm Exp $ */ +/* $OpenBSD: kex.c,v 1.124 2016/09/22 17:52:53 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * @@ -109,6 +109,7 @@ static const struct kexalg kexalgs[] = { #endif /* WITH_OPENSSL */ #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL) { KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, + { KEX_CURVE25519_SHA256_OLD, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 }, #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */ { NULL, -1, -1, -1}, }; -- cgit v1.2.3