diff options
| author | Hans Nilsson <[email protected]> | 2017-02-03 14:46:47 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-03 14:46:47 +0100 |
| commit | 08726ff1c6a0bfb9989034920184438aed9db8bd (patch) | |
| tree | 7a28815ce03f614a505cf7118a92fb120424243e /lib | |
| parent | 7edd60122d2242c24455a3dc41b0c52519cd565a (diff) | |
| parent | 2e25e7890af04d9001fa777d848ebce6d059edf2 (diff) | |
| download | otp-08726ff1c6a0bfb9989034920184438aed9db8bd.tar.gz otp-08726ff1c6a0bfb9989034920184438aed9db8bd.tar.bz2 otp-08726ff1c6a0bfb9989034920184438aed9db8bd.zip | |
Merge branch 'hans/ssh/default_algo_list/OTP-14110'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/doc/src/ssh_app.xml | 9 |
1 files 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 @@ <item>diffie-hellman-group-exchange-sha1</item> <item>diffie-hellman-group-exchange-sha256</item> <item>diffie-hellman-group14-sha1</item> - <item>diffie-hellman-group1-sha1</item> + <item>diffie-hellman-group14-sha256</item> + <item>diffie-hellman-group16-sha512</item> + <item>diffie-hellman-group18-sha512</item> + <item>(diffie-hellman-group1-sha1, retired: can be enabled with the <c>preferred_algorithms</c> option)</item> </list> </item> @@ -157,7 +160,7 @@ <item>ecdsa-sha2-nistp384</item> <item>ecdsa-sha2-nistp521</item> <item>ssh-rsa</item> - <item>ssh-dss</item> + <item>(ssh-dss, retired: can be enabled with the <c>preferred_algorithms</c> option)</item> </list> </item> @@ -306,6 +309,8 @@ <p>Comment: Defines hmac-sha2-256 and hmac-sha2-512 </p> </item> + + <item>Work in progress: <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-kex-sha2">https://tools.ietf.org/html/draft-ietf-curdle-ssh-kex-sha2-05</url>, Key Exchange (KEX) Method Updates and Recommendations for Secure Shell (SSH)</item> </list> |