aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-07 12:50:43 +0100
committerHans Nilsson <[email protected]>2017-02-07 12:50:43 +0100
commita7582454a5414232823587ee1ba58da55a87953d (patch)
treeba537a312f1f764873a08ad73e8f18088c06dd49
parent12eb5089147513d1bc0797617bb6e95bc6e0c332 (diff)
parentda0f783dce990e6c3953a7852a8c90a1933b21b2 (diff)
downloadotp-a7582454a5414232823587ee1ba58da55a87953d.tar.gz
otp-a7582454a5414232823587ee1ba58da55a87953d.tar.bz2
otp-a7582454a5414232823587ee1ba58da55a87953d.zip
Merge branch 'hans/ssh/default_algo_list/OTP-14110'
-rw-r--r--lib/ssh/src/ssh_transport.erl5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 02209d5dfd..5d178a202d 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -84,11 +84,6 @@ default_algorithms(kex) ->
'diffie-hellman-group1-sha1' % Gone in OpenSSH 7.3.p1
]);
-default_algorithms(public_key) ->
- supported_algorithms(public_key, [
- 'ssh-dss' % Gone in OpenSSH 7.3.p1
- ]);
-
default_algorithms(cipher) ->
supported_algorithms(cipher, same(['AEAD_AES_128_GCM',
'AEAD_AES_256_GCM']));