diff options
| author |   djm <djm@openbsd.org> | 2016-09-22 17:55:13 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-09-22 17:55:13 +0000 |
| commit | 28ce47669f44928f7a4ef733f2b5469a72fdfc45 (patch) | |
| tree | 79c1d9c49a4bf83e34530448da8c9739d72a8532 | |
| parent | support plain curve25519-sha256 KEX algorithm now that it is (diff) | |
| download | wireguard-openbsd-28ce47669f44928f7a4ef733f2b5469a72fdfc45.tar.xz wireguard-openbsd-28ce47669f44928f7a4ef733f2b5469a72fdfc45.zip | |
mention curve25519-sha256 KEX
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 259a786a172..50eb03b24c2 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/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@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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 8468a1ad5eb..6d91dda53f4 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/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 @@ -874,6 +874,8 @@ The supported algorithms are: .Pp .Bl -item -compact -offset indent .It +curve25519-sha256 +.It curve25519-sha256@libssh.org .It diffie-hellman-group1-sha1 @@ -893,7 +895,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 |