summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-09-22 17:52:53 +0000
committerDamien Miller <djm@mindrot.org>2016-09-24 05:39:37 +1000
commit0493766d5676c7ca358824ea8d3c90f6047953df (patch)
tree43d2bee12148323d07bf83f9e2a30c4caf637a71
parentf31c654b30a6f02ce0b8ea8ab81791b675489628 (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
-rw-r--r--kex.c3
-rw-r--r--myproposal.h7
2 files changed, 7 insertions, 3 deletions
diff --git a/kex.c b/kex.c
index edb61bee7..811e2cf6c 100644
--- a/kex.c
+++ b/kex.c
@@ -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};
diff --git a/myproposal.h b/myproposal.h
index 5c088e5e9..4729b30b0 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: myproposal.h,v 1.52 2016/09/05 14:02:42 djm Exp $ */ 1/* $OpenBSD: myproposal.h,v 1.53 2016/09/22 17:52:53 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -84,7 +84,9 @@
84 84
85#ifdef WITH_OPENSSL 85#ifdef WITH_OPENSSL
86# ifdef HAVE_EVP_SHA256 86# ifdef HAVE_EVP_SHA256
87# define KEX_CURVE25519_METHODS "curve25519-sha256@libssh.org," 87# define KEX_CURVE25519_METHODS \
88 "curve25519-sha256," \
89 "curve25519-sha256@libssh.org,"
88# else 90# else
89# define KEX_CURVE25519_METHODS "" 91# define KEX_CURVE25519_METHODS ""
90# endif 92# endif
@@ -139,6 +141,7 @@
139#else /* WITH_OPENSSL */ 141#else /* WITH_OPENSSL */
140 142
141#define KEX_SERVER_KEX \ 143#define KEX_SERVER_KEX \
144 "curve25519-sha256," \
142 "curve25519-sha256@libssh.org" 145 "curve25519-sha256@libssh.org"
143#define KEX_DEFAULT_PK_ALG \ 146#define KEX_DEFAULT_PK_ALG \
144 "ssh-ed25519-cert-v01@openssh.com," \ 147 "ssh-ed25519-cert-v01@openssh.com," \