diff options
| author |   djm <djm@openbsd.org> | 2018-02-16 02:40:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-02-16 02:40:45 +0000 |
| commit | e68047cfae8f76e3004d663dabc2613ce2eb2500 (patch) | |
| tree | 7a1b04b9ad43f16485c14a97a2c6492332e01921 | |
| parent | stop loading DSA keys by default, remove sshd_config stanza and manpage (diff) | |
| download | wireguard-openbsd-e68047cfae8f76e3004d663dabc2613ce2eb2500.tar.xz wireguard-openbsd-e68047cfae8f76e3004d663dabc2613ce2eb2500.zip | |
Mention recent DH KEX methods:
diffie-hellman-group14-sha256
diffie-hellman-group16-sha512
diffie-hellman-group18-sha512
From Jakub Jelen via bz#2826
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 7 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 27c649fab26..a128e4f0e0d 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.265 2018/02/10 09:03:54 djm Exp $ -.Dd $Mdocdate: February 10 2018 $ +.\" $OpenBSD: ssh_config.5,v 1.266 2018/02/16 02:40:45 djm Exp $ +.Dd $Mdocdate: February 16 2018 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1015,7 +1015,10 @@ The default is: curve25519-sha256,curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, +diffie-hellman-group16-sha512, +diffie-hellman-group18-sha512, diffie-hellman-group-exchange-sha1, +diffie-hellman-group14-sha256, diffie-hellman-group14-sha1 .Ed .Pp diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 74d8479bed2..e051df91254 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,7 +33,7 @@ .\" (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.262 2018/02/16 02:32:40 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.263 2018/02/16 02:40:45 djm Exp $ .Dd $Mdocdate: February 16 2018 $ .Dt SSHD_CONFIG 5 .Os @@ -880,6 +880,12 @@ diffie-hellman-group1-sha1 .It diffie-hellman-group14-sha1 .It +diffie-hellman-group14-sha256 +.It +diffie-hellman-group16-sha512 +.It +diffie-hellman-group18-sha512 +.It diffie-hellman-group-exchange-sha1 .It diffie-hellman-group-exchange-sha256 @@ -896,7 +902,8 @@ The default is: curve25519-sha256,curve25519-sha256@libssh.org, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, diffie-hellman-group-exchange-sha256, -diffie-hellman-group14-sha1 +diffie-hellman-group16-sha512,diffie-hellman-group18-sha512, +diffie-hellman-group14-sha256,diffie-hellman-group14-sha1 .Ed .Pp The list of available key exchange algorithms may also be obtained using |