diff options
| author | Hans Nilsson <[email protected]> | 2018-11-19 17:25:30 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-11-19 17:25:30 +0100 |
| commit | 3826f8f3580d62f53a8990de4c731a07313d34dc (patch) | |
| tree | f4bb668dca3f565f279da9f9b2ddcd396a9f89c9 /lib/ssh/doc/src/ssh_app.xml | |
| parent | 8de34c46987435ff92bae9d6980866472acfa059 (diff) | |
| parent | 68b7a5fb25a06131220e01876c0b1e5434161da3 (diff) | |
| download | otp-3826f8f3580d62f53a8990de4c731a07313d34dc.tar.gz otp-3826f8f3580d62f53a8990de4c731a07313d34dc.tar.bz2 otp-3826f8f3580d62f53a8990de4c731a07313d34dc.zip | |
Merge branch 'maint'
* maint:
ssh: Add Edward curves to the documentation
ssh: Update test cases for eddsa
ssh: Add public keys 'ssh-ed25519' and 'ssh-ed448'
Diffstat (limited to 'lib/ssh/doc/src/ssh_app.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh_app.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml index eb804e67dc..0c22a50c3f 100644 --- a/lib/ssh/doc/src/ssh_app.xml +++ b/lib/ssh/doc/src/ssh_app.xml @@ -175,6 +175,8 @@ <item>ecdsa-sha2-nistp384</item> <item>ecdsa-sha2-nistp521</item> <item>ecdsa-sha2-nistp256</item> + <item>ssh-ed25519</item> + <item>ssh-ed448</item> <item>ssh-rsa</item> <item>rsa-sha2-256</item> <item>rsa-sha2-512</item> @@ -378,7 +380,11 @@ <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> - + + <item> + <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-ed448">Ed25519 and Ed448 public key algorithms for the Secure Shell (SSH) protocol (work in progress)</url> + </item> + </list> </section> |