diff options
| author | Hans Nilsson <[email protected]> | 2015-10-08 16:05:01 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-08 16:05:01 +0200 |
| commit | 7d88a6e607b0bc06a0d0cab0afbf81abfe9bef41 (patch) | |
| tree | b8de8ef2acb774e4d422a65df6a56c671be027b8 /lib/ssh/doc/src | |
| parent | 2e3490364359254d68c45bae7d920e70c895c9de (diff) | |
| parent | 309c4b503df1a586e57f6558b6de08245fa80d47 (diff) | |
| download | otp-7d88a6e607b0bc06a0d0cab0afbf81abfe9bef41.tar.gz otp-7d88a6e607b0bc06a0d0cab0afbf81abfe9bef41.tar.bz2 otp-7d88a6e607b0bc06a0d0cab0afbf81abfe9bef41.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 93bea09e4e..c7a09d65a8 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -40,7 +40,7 @@ <list type="bulleted"> <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 public key algorithms:ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521, ssh-rsa and ssh-dss.</item> <item>Supported MAC algorithms: hmac-sha2-512, hmac-sha2-256 and hmac-sha1.</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> |