diff options
| author | Hans Nilsson <[email protected]> | 2015-10-08 16:03:47 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-08 16:03:47 +0200 |
| commit | 0bc373ca42a1e880a97e34f664ab968144c2a4f4 (patch) | |
| tree | ecfc42f4247520e27524a22dc72a9da9b5d9d7fd /lib/ssh/doc | |
| parent | 2c7e387961251af59f14bca39cbf8fbbe880383e (diff) | |
| parent | 4a356cf070e197cec375b562891af8fe9634c306 (diff) | |
| download | otp-0bc373ca42a1e880a97e34f664ab968144c2a4f4.tar.gz otp-0bc373ca42a1e880a97e34f664ab968144c2a4f4.tar.bz2 otp-0bc373ca42a1e880a97e34f664ab968144c2a4f4.zip | |
Merge branch 'hans/ssh/ecdsa/OTP-12936' into maint
Diffstat (limited to 'lib/ssh/doc')
| -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> |