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/src/ssh.hrl | |
| 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/src/ssh.hrl')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 4ac5b7a2c1..66dbf0b144 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -118,6 +118,9 @@ 'diffie-hellman-group14-sha256' | 'diffie-hellman-group16-sha512' | 'diffie-hellman-group18-sha512' | + 'curve25519-sha256' | + '[email protected]' | + 'curve448-sha512' | 'ecdh-sha2-nistp256' | 'ecdh-sha2-nistp384' | 'ecdh-sha2-nistp521' |