From 2e25e7890af04d9001fa777d848ebce6d059edf2 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 2 Feb 2017 16:52:37 +0100 Subject: ssh: document new and retired algorithms --- lib/ssh/doc/src/ssh_app.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml index 5cc4c24889..5f710decc1 100644 --- a/lib/ssh/doc/src/ssh_app.xml +++ b/lib/ssh/doc/src/ssh_app.xml @@ -146,7 +146,10 @@ diffie-hellman-group-exchange-sha1 diffie-hellman-group-exchange-sha256 diffie-hellman-group14-sha1 - diffie-hellman-group1-sha1 + diffie-hellman-group14-sha256 + diffie-hellman-group16-sha512 + diffie-hellman-group18-sha512 + (diffie-hellman-group1-sha1, retired: can be enabled with the preferred_algorithms option) @@ -157,7 +160,7 @@ ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-rsa - ssh-dss + (ssh-dss, retired: can be enabled with the preferred_algorithms option) @@ -306,6 +309,8 @@

Comment: Defines hmac-sha2-256 and hmac-sha2-512

+ + Work in progress: https://tools.ietf.org/html/draft-ietf-curdle-ssh-kex-sha2-05, Key Exchange (KEX) Method Updates and Recommendations for Secure Shell (SSH) -- cgit v1.2.3