diff options
| author | Hans Nilsson <[email protected]> | 2018-08-23 14:32:34 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 14:32:34 +0200 |
| commit | c30530b3b3512668d9851cd8b88a7d4ad6aeafc3 (patch) | |
| tree | 6402fc45a8be56e338e0f0fc59636d1ba5389707 /lib/ssh/doc/src | |
| parent | a1a72225ec74dfcbc07506af216151ce34765e82 (diff) | |
| parent | 74b745494dfa7ef091c0b59dee284606f3d23ce3 (diff) | |
| download | otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.tar.gz otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.tar.bz2 otp-c30530b3b3512668d9851cd8b88a7d4ad6aeafc3.zip | |
Merge branch 'maint'
* maint:
crypto: doc x25519 & x448
crypto: Test vectors for ecdh x25519 and x448
crypto: Remove the term 'eddh'
crypto: Enable EDDH all OpenSSL cryptolib over beta version 1.1.1-pre8
ssh: Doc updates
ssh: spec curve25519 & curve448
ssh: Fix non-conforming key generation in kex for x25519 and x448
ssh: Enable curve448-sha512 and curve25519-sha256
ssh: Remove the term 'eddh'
crypto: Disable non-working SHA3_224 and SHA3_256
crypto: doc SHA3 (hash & hmac)
crypto: Tests for SHA3
crypto: SHA3 hash on OpenSSL-1.1.1
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh_app.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml index 4f0896d613..e80bb1853d 100644 --- a/lib/ssh/doc/src/ssh_app.xml +++ b/lib/ssh/doc/src/ssh_app.xml @@ -151,6 +151,9 @@ <item>diffie-hellman-group16-sha512</item> <item>diffie-hellman-group18-sha512</item> <item>diffie-hellman-group14-sha256</item> + <item>curve25519-sha256</item> + <item>[email protected]</item> + <item>curve448-sha512</item> <item>diffie-hellman-group14-sha1</item> <item>diffie-hellman-group-exchange-sha1</item> <item>(diffie-hellman-group1-sha1, retired: It can be enabled with the @@ -366,6 +369,10 @@ </list> <p/> </item> + + <item> + <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-curves">Secure Shell (SSH) Key Exchange Method using Curve25519 and Curve448 (work in progress)</url> + </item> </list> |