diff options
| author | Hans Nilsson <[email protected]> | 2015-10-06 15:23:26 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-06 15:23:26 +0200 |
| commit | 4d400135e1b4a79d9d55ec25ba07513fd4396387 (patch) | |
| tree | 45f501a1a17b079c55095443405af7e12fd15cb1 /lib/ssh/doc/src/ssh.xml | |
| parent | b99010e5f188097fd9a83204ac6ce2dcd048e640 (diff) | |
| parent | 258c8cd05d0a4215255121e7466e4ccd4c8ae82c (diff) | |
| download | otp-4d400135e1b4a79d9d55ec25ba07513fd4396387.tar.gz otp-4d400135e1b4a79d9d55ec25ba07513fd4396387.tar.bz2 otp-4d400135e1b4a79d9d55ec25ba07513fd4396387.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 293d618eed..dd85baf219 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -42,7 +42,8 @@ <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-512, hmac-sha2-256 and hmac-sha1.</item> - <item>Supported encryption algorithms: aes128-ctr, aes128-cb and 3des-cbc.</item> + <item>Supported MAC algorithms: hmac-sha2-256 and hmac-sha1.</item> + <item>Supported encryption algorithms: aes256-ctr, aes192-ctr, aes128-ctr, aes128-cb and 3des-cbc.</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. |