aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-02 08:45:25 +0200
committerHans Nilsson <[email protected]>2015-10-02 08:45:25 +0200
commitadc4d63f2c2e14d8646928347887aff95b1ffdcd (patch)
tree3c4a9927514bac0b90ea6ec8e47d91041065f289
parentc1d11c28ca748075cae5330102bccd10a56b8686 (diff)
parent6b5aa5c7b807b0963fcfc31c2c4ee22249f75428 (diff)
downloadotp-adc4d63f2c2e14d8646928347887aff95b1ffdcd.tar.gz
otp-adc4d63f2c2e14d8646928347887aff95b1ffdcd.tar.bz2
otp-adc4d63f2c2e14d8646928347887aff95b1ffdcd.zip
Merge branch 'hans/ssh/doc-ecdh_and_hmac512' into maint
* hans/ssh/doc-ecdh_and_hmac512: ssh: document ecdh and hmac-sha2-512
-rw-r--r--lib/ssh/doc/src/ssh.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index cf5e8f1aff..6c95fa3399 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -41,10 +41,10 @@
<item>For application dependencies see <seealso marker="SSH_app"> ssh(6)</seealso> </item>
<item>Supported SSH version is 2.0.</item>
<item>Supported public key algorithms: ssh-rsa and ssh-dss.</item>
- <item>Supported MAC algorithms: hmac-sha2-256 and hmac-sha1.</item>
+ <item>Supported MAC algorithms: hmac-sha2-512, hmac-sha2-256 and hmac-sha1.</item>
<item>Supported encryption algorithms: aes128-ctr, aes128-cb and 3des-cbc.</item>
- <item>Supported key exchange algorithms: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1 and diffie-hellman-group-exchange-sha256.</item>
- <item>Supported compression algorithms: none, zlib, [email protected],</item>
+ <item>Supported key exchange algorithms: ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1 and diffie-hellman-group-exchange-sha256.</item>
+ <item>Supported compression algorithms: none, zlib</item>
<item>Supports unicode filenames if the emulator and the underlaying OS support it.
See section DESCRIPTION in the
<seealso marker="kernel:file">file</seealso> manual page in <c>kernel</c>