diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:33:36 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:33:36 +0100 |
| commit | c56a89474b95f5460cc7add09f0258815596e1ac (patch) | |
| tree | 7498c50ba92e8a5f34b14fc403384693d673c60e /lib | |
| parent | 06add1440f977f4c392040d41350268610fd4faf (diff) | |
| parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
| download | otp-c56a89474b95f5460cc7add09f0258815596e1ac.tar.gz otp-c56a89474b95f5460cc7add09f0258815596e1ac.tar.bz2 otp-c56a89474b95f5460cc7add09f0258815596e1ac.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Document currently supported algorithms
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index ed88b3a1af..e30c6f1ccc 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -33,9 +33,20 @@ <module>ssh</module> <modulesummary>Main API of the SSH application</modulesummary> <description> - <p>Interface module for the SSH application</p> + <p>Interface module for the SSH application. </p> </description> + <section> + <title>SSH</title> + + <list type="bulleted"> + <item>ssh requires the crypto and public_key applications.</item> + <item>Supported SSH-version is 2.0 </item> + <item>Currently supports only a minimum of mac and encryption algorithms i.e. + hmac-sha1, and aes128-cb and 3des-cbc.</item> + </list> + + </section> <section> <title>COMMON DATA TYPES </title> |