diff options
| author | Hans Nilsson <[email protected]> | 2017-05-17 15:19:45 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-05-17 15:19:45 +0200 |
| commit | 21505aa6ccb27a533d814e83131c2961d47ba8ed (patch) | |
| tree | a8a126ab58633d4333259c3fb97196f9c9be4423 /lib/ssh/src | |
| parent | 55424641b4945b435f401f172742fe88d47ce4fb (diff) | |
| parent | 235472ad819537bb357e254f48bae506a1e63213 (diff) | |
| download | otp-21505aa6ccb27a533d814e83131c2961d47ba8ed.tar.gz otp-21505aa6ccb27a533d814e83131c2961d47ba8ed.tar.bz2 otp-21505aa6ccb27a533d814e83131c2961d47ba8ed.zip | |
Merge branch 'hans/ssh/test_rsa_sha2_/OTP-14362'
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index bd1cb4bd22..aaec733f3c 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -92,10 +92,7 @@ default_algorithms(cipher) -> default_algorithms(mac) -> supported_algorithms(mac, same(['AEAD_AES_128_GCM', 'AEAD_AES_256_GCM'])); -default_algorithms(public_key) -> - supported_algorithms(public_key, ['rsa-sha2-256', - 'rsa-sha2-384', - 'rsa-sha2-512']); + default_algorithms(Alg) -> supported_algorithms(Alg, []). @@ -122,10 +119,9 @@ supported_algorithms(public_key) -> {'ecdsa-sha2-nistp384', [{public_keys,ecdsa}, {hashs,sha384}, {ec_curve,secp384r1}]}, {'ecdsa-sha2-nistp521', [{public_keys,ecdsa}, {hashs,sha512}, {ec_curve,secp521r1}]}, {'ecdsa-sha2-nistp256', [{public_keys,ecdsa}, {hashs,sha256}, {ec_curve,secp256r1}]}, + {'ssh-rsa', [{public_keys,rsa}, {hashs,sha} ]}, {'rsa-sha2-256', [{public_keys,rsa}, {hashs,sha256} ]}, - {'rsa-sha2-384', [{public_keys,rsa}, {hashs,sha384} ]}, {'rsa-sha2-512', [{public_keys,rsa}, {hashs,sha512} ]}, - {'ssh-rsa', [{public_keys,rsa}, {hashs,sha} ]}, {'ssh-dss', [{public_keys,dss}, {hashs,sha} ]} % Gone in OpenSSH 7.3.p1 ]); |