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/src/ssh.hrl | |
| 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/src/ssh.hrl')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 3e9b1add3b..923e9309f4 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -129,6 +129,8 @@ -type pubkey_alg() :: 'ecdsa-sha2-nistp256' | 'ecdsa-sha2-nistp384' | 'ecdsa-sha2-nistp521' | + 'ssh-ed25519' | + 'ssh-ed448' | 'rsa-sha2-256' | 'rsa-sha2-512' | 'ssh-dss' | |