aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-09-03 10:14:56 +0200
committerMarcus Arendt <[email protected]>2014-09-03 10:14:56 +0200
commit8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527 (patch)
treed01f65439f9074afc57818f1c1aacfc323d91b04 /lib/ssh/doc/src
parentab526c6500c61d03e632fefcac9f46c08c150556 (diff)
parente3a947d06915bde9d11e80b9d6f4e31460a3cf51 (diff)
downloadotp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.tar.gz
otp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.tar.bz2
otp-8ad5bd0ef8143f5ac32bd2df11d59a20e7eb0527.zip
Merge branch 'arekinath/ssh/aes-ctr' into maint
* arekinath/ssh/aes-ctr: ssh: check if ssh client supports newer cipher- and MAC-algorithms SSH: only enable ciphers/MACs when they are available in crypto SSH: add ssh_to_openssh test for ciphers and macs SSH: documentation update for new algos SSH: add support for aes128-ctr and hmac-sha2-256
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 876eba598a..9f5d1c003d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -36,8 +36,8 @@
<list type="bulleted">
<item>SSH requires the crypto and public_key applications.</item>
<item>Supported SSH version is 2.0 </item>
- <item>Supported MAC algorithms: hmac-sha1</item>
- <item>Supported encryption algorithms: aes128-cb and 3des-cbc</item>
+ <item>Supported MAC algorithms: hmac-sha2-256 and hmac-sha1</item>
+ <item>Supported encryption algorithms: aes128-ctr, aes128-cb and 3des-cbc</item>
<item>Supports unicode filenames if the emulator and the underlaying OS supports it. See the DESCRIPTION section in <seealso marker="kernel:file">file</seealso> for information about this subject</item>
<item>Supports unicode in shell and cli</item>
</list>