diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-02-16 03:40:45 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-02-16 03:42:09 +0100 |
| commit | 680321f3eb46773883111e234b3c262142ff7c5b (patch) | |
| tree | 9bd9e59e47b9c4bce5237341de7128a6839dfbea /ssh_config.5 | |
| parent | upstream: stop loading DSA keys by default, remove sshd_config (diff) | |
| download | openssh-680321f3eb46773883111e234b3c262142ff7c5b.tar.xz openssh-680321f3eb46773883111e234b3c262142ff7c5b.zip | |
upstream: Mention recent DH KEX methods:
diffie-hellman-group14-sha256
diffie-hellman-group16-sha512
diffie-hellman-group18-sha512
From Jakub Jelen via bz#2826
OpenBSD-Commit-ID: 51bf769f06e55447f4bfa7306949e62d2401907a
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 27c649fab..a128e4f0e 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.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 |