diff options
| author | Hans Nilsson <[email protected]> | 2018-08-23 14:29:46 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 14:29:46 +0200 |
| commit | 74b745494dfa7ef091c0b59dee284606f3d23ce3 (patch) | |
| tree | 85aabc2fecef5eb4997d19ad0dd95f0fc7540e07 /lib/ssh/doc | |
| parent | 6b8af74420d37328523184e60f62f30e2667609a (diff) | |
| parent | 58229942f0360f02d2be0a5c152b42d17da2457e (diff) | |
| download | otp-74b745494dfa7ef091c0b59dee284606f3d23ce3.tar.gz otp-74b745494dfa7ef091c0b59dee284606f3d23ce3.tar.bz2 otp-74b745494dfa7ef091c0b59dee284606f3d23ce3.zip | |
Merge branch 'hans/ssh/x25519_x448/OTP-15133' into maint
* hans/ssh/x25519_x448/OTP-15133:
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'
Diffstat (limited to 'lib/ssh/doc')
| -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> |