summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-02-16 02:40:45 +0000
committerDamien Miller <djm@mindrot.org>2018-02-16 13:42:09 +1100
commit680321f3eb46773883111e234b3c262142ff7c5b (patch)
tree9bd9e59e47b9c4bce5237341de7128a6839dfbea /ssh_config.5
parent88c50a5ae20902715f0fca306bb9c38514f71679 (diff)
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.57
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 27c649fa..a128e4f0 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