diff options
| author | Hans Nilsson <[email protected]> | 2018-08-23 14:27:40 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 14:27:40 +0200 |
| commit | c1def1f61f74ac6e8e0703d01d0819d142c11de5 (patch) | |
| tree | 30c44807dd0f4272efe2b1b9e4267b2a7ce47dfd /lib/ssh/doc/src | |
| parent | 15785a2f9167e85d52d8e6d238624f5dcdc7cf7d (diff) | |
| parent | d3e7e665d8b687094c0857dd086654350bec9055 (diff) | |
| download | otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.tar.gz otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.tar.bz2 otp-c1def1f61f74ac6e8e0703d01d0819d142c11de5.zip | |
Merge branch 'maint'
* maint:
ssh: Doc updates
ssh: some benchmarking of [email protected]
ssh: -spec
ssh: Add [email protected] cipher
crypto: doc poly1305
crypto: doc chacha20
crypto: Error in test case
crypto: chacha20 test case
crypto: poly1305 test case
crypto: -spec
crypto: chacha20 cipher
crypto: Mac POLY1305 if >=OpenSSL 1.1.1-pre8
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh_app.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml index 9ec909d733..4f0896d613 100644 --- a/lib/ssh/doc/src/ssh_app.xml +++ b/lib/ssh/doc/src/ssh_app.xml @@ -186,6 +186,7 @@ <tag>Encryption algorithms (ciphers)</tag> <item> <list type="bulleted"> + <item>[email protected]</item> <item>[email protected]</item> <item>aes256-ctr</item> <item>aes192-ctr</item> |