diff options
| author | Hans Nilsson <[email protected]> | 2018-06-27 13:41:50 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-08-23 12:46:59 +0200 |
| commit | bd78bea89c1583af283b058247370ddfd06833a9 (patch) | |
| tree | 048b7e3c04fb7df36f19173189922e072bbdf5f6 /lib/ssh | |
| parent | 062f6c8333a02c615da16d9732690560f53beb80 (diff) | |
| download | otp-bd78bea89c1583af283b058247370ddfd06833a9.tar.gz otp-bd78bea89c1583af283b058247370ddfd06833a9.tar.bz2 otp-bd78bea89c1583af283b058247370ddfd06833a9.zip | |
ssh: Enable curve448-sha512 and curve25519-sha256
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 0add320518..4bef5e2cbb 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -104,10 +104,6 @@ algo_two_spec_class(_) -> false. default_algorithms(kex) -> supported_algorithms(kex, [ - %% Under devolpment: - 'curve25519-sha256', - '[email protected]', - 'curve448-sha512', %% Gone in OpenSSH 7.3.p1: 'diffie-hellman-group1-sha1' ]); @@ -131,6 +127,10 @@ supported_algorithms(kex) -> {'ecdh-sha2-nistp384', [{public_keys,ecdh}, {curves,secp384r1}, {hashs,sha384}]}, {'ecdh-sha2-nistp521', [{public_keys,ecdh}, {curves,secp521r1}, {hashs,sha512}]}, {'ecdh-sha2-nistp256', [{public_keys,ecdh}, {curves,secp256r1}, {hashs,sha256}]}, + {'diffie-hellman-group-exchange-sha256', [{public_keys,dh}, {hashs,sha256}]}, + {'diffie-hellman-group16-sha512', [{public_keys,dh}, {hashs,sha512}]}, % In OpenSSH 7.3.p1 + {'diffie-hellman-group18-sha512', [{public_keys,dh}, {hashs,sha512}]}, % In OpenSSH 7.3.p1 + {'diffie-hellman-group14-sha256', [{public_keys,dh}, {hashs,sha256}]}, % In OpenSSH 7.3.p1 %% https://tools.ietf.org/html/draft-ietf-curdle-ssh-curves %% Secure Shell (SSH) Key Exchange Method using Curve25519 and Curve448 {'curve25519-sha256', [{public_keys,ecdh}, {curves,x25519}, {hashs,sha256}]}, |