[openssh-commits] [openssh] 03/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 16277fc45ffc95e4ffc3d45971ff8320b974de2b
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Sep 22 17:55:13 2016 +0000

    upstream commit
    
    mention curve25519-sha256 KEX
    
    Upstream-ID: 33ae1f433ce4795ffa6203761fbdf86e0d7ffbaf
---
 ssh_config.5  | 6 +++---
 sshd_config.5 | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 259a786..50eb03b 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 $
-.Dd $Mdocdate: September 5 2016 $
+.\" $OpenBSD: ssh_config.5,v 1.238 2016/09/22 17:55:13 djm Exp $
+.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 at libssh.org,
+curve25519-sha256,curve25519-sha256 at 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 dd94b48..6c30f70 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 $
-.Dd $Mdocdate: September 21 2016 $
+.\" $OpenBSD: sshd_config.5,v 1.234 2016/09/22 17:55:13 djm Exp $
+.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 at libssh.org
 .It
 diffie-hellman-group1-sha1
@@ -892,7 +894,7 @@ ecdh-sha2-nistp521
 .Pp
 The default is:
 .Bd -literal -offset indent
-curve25519-sha256 at libssh.org,
+curve25519-sha256,curve25519-sha256 at libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
 diffie-hellman-group-exchange-sha256,
 diffie-hellman-group14-sha1

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.