upstream commit

mention curve25519-sha256 KEX Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf
author: djm@openbsd.org <djm@openbsd.org> 2016-09-22 17:55:13 +0000
committer: Damien Miller <djm@mindrot.org> 2016-09-24 05:39:37 +1000
commit: 16277fc45ffc95e4ffc3d45971ff8320b974de2b (patch)
tree: ed55a4c8a34cb0b37a8d2471c58a3ab7c0e8b641
parent: 0493766d5676c7ca358824ea8d3c90f6047953df (diff)
2 files changed, 8 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 259a786a1..50eb03b24 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.237 2016/09/05 14:02:42 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.238 2016/09/22 17:55:13 djm Exp $
-.Dd $Mdocdate: September 5 2016 $
+.Dd $Mdocdate: September 22 2016 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1133,7 +1133,7 @@ character, then the specified methods will be appended to the default set
 instead of replacing them.
 The default is:
 .Bd -literal -offset indent
-curve25519-sha256@libssh.org,
+curve25519-sha256,curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group-exchange-sha1,
diff --git a/sshd_config.5 b/sshd_config.5
index dd94b4801..6c30f7084 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.233 2016/09/21 01:34:45 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.234 2016/09/22 17:55:13 djm Exp $
-.Dd $Mdocdate: September 21 2016 $
+.Dd $Mdocdate: September 22 2016 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -873,6 +873,8 @@ The supported algorithms are:
 .Pp
 .Bl -item -compact -offset indent
 .It
+curve25519-sha256
+.It
 curve25519-sha256@libssh.org
 .It
 diffie-hellman-group1-sha1
@@ -892,7 +894,7 @@ ecdh-sha2-nistp521
 .Pp
 The default is:
 .Bd -literal -offset indent
-curve25519-sha256@libssh.org,
+curve25519-sha256,curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group14-sha1
author	djm@openbsd.org <djm@openbsd.org>	2016-09-22 17:55:13 +0000
committer	Damien Miller <djm@mindrot.org>	2016-09-24 05:39:37 +1000
commit	16277fc45ffc95e4ffc3d45971ff8320b974de2b (patch)
tree	ed55a4c8a34cb0b37a8d2471c58a3ab7c0e8b641
parent	0493766d5676c7ca358824ea8d3c90f6047953df (diff)

diff --git a/ssh_config.5 b/ssh_config.5 index 259a786a1..50eb03b24 100644 --- a/ssh_config.5 +++ b/ssh_config.5
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: ssh_config.5,v 1.237 2016/09/05 14:02:42 djm Exp $	36	.\" $OpenBSD: ssh_config.5,v 1.238 2016/09/22 17:55:13 djm Exp $
37	.Dd $Mdocdate: September 5 2016 $	37	.Dd $Mdocdate: September 22 2016 $
38	.Dt SSH_CONFIG 5	38	.Dt SSH_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -1133,7 +1133,7 @@ character, then the specified methods will be appended to the default set
1133	instead of replacing them.	1133	instead of replacing them.
1134	The default is:	1134	The default is:
1135	.Bd -literal -offset indent	1135	.Bd -literal -offset indent
1136	curve25519-sha256@libssh.org,	1136	curve25519-sha256,curve25519-sha256@libssh.org,
1137	ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,	1137	ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
1138	diffie-hellman-group-exchange-sha256,	1138	diffie-hellman-group-exchange-sha256,
1139	diffie-hellman-group-exchange-sha1,	1139	diffie-hellman-group-exchange-sha1,


diff --git a/sshd_config.5 b/sshd_config.5 index dd94b4801..6c30f7084 100644 --- a/sshd_config.5 +++ b/sshd_config.5
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: sshd_config.5,v 1.233 2016/09/21 01:34:45 djm Exp $	36	.\" $OpenBSD: sshd_config.5,v 1.234 2016/09/22 17:55:13 djm Exp $
37	.Dd $Mdocdate: September 21 2016 $	37	.Dd $Mdocdate: September 22 2016 $
38	.Dt SSHD_CONFIG 5	38	.Dt SSHD_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -873,6 +873,8 @@ The supported algorithms are:
873	.Pp	873	.Pp
874	.Bl -item -compact -offset indent	874	.Bl -item -compact -offset indent
875	.It	875	.It
		876	curve25519-sha256
		877	.It
876	curve25519-sha256@libssh.org	878	curve25519-sha256@libssh.org
877	.It	879	.It
878	diffie-hellman-group1-sha1	880	diffie-hellman-group1-sha1
@@ -892,7 +894,7 @@ ecdh-sha2-nistp521
892	.Pp	894	.Pp
893	The default is:	895	The default is:
894	.Bd -literal -offset indent	896	.Bd -literal -offset indent
895	curve25519-sha256@libssh.org,	897	curve25519-sha256,curve25519-sha256@libssh.org,
896	ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,	898	ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
897	diffie-hellman-group-exchange-sha256,	899	diffie-hellman-group-exchange-sha256,
898	diffie-hellman-group14-sha1	900	diffie-hellman-group14-sha1