Client->Transport for disable_algorithms

2 files changed, 21 insertions, 1 deletions

diff --git a/paramiko/client.py b/paramiko/client.py
index 322f5fa9..b8e043a3 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -368,7 +368,10 @@ class SSHClient(ClosingContextManager):
                 raise NoValidConnectionsError(errors)
 
         t = self._transport = Transport(
-            sock, gss_kex=gss_kex, gss_deleg_creds=gss_deleg_creds
+            sock,
+            gss_kex=gss_kex,
+            gss_deleg_creds=gss_deleg_creds,
+            disable_algorithms=disable_algorithms,
         )
         t.use_compression(compress=compress)
         t.set_gss_host(
diff --git a/tests/test_client.py b/tests/test_client.py
index 153106e8..f40c38c1 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -34,6 +34,7 @@ import weakref
 from tempfile import mkstemp
 
 from pytest_relaxed import raises
+from mock import patch, Mock
 
 import paramiko
 from paramiko import SSHClient
@@ -654,6 +655,22 @@ class SSHClientTest(ClientTest):
         client.set_missing_host_key_policy(paramiko.AutoAddPolicy)
         assert isinstance(client._policy, paramiko.AutoAddPolicy)
 
+    @patch("paramiko.client.Transport")
+    def test_disable_algorithms_defaults_to_None(self, Transport):
+        SSHClient().connect("host", sock=Mock(), password="no")
+        assert Transport.call_args[1]["disable_algorithms"] is None
+
+    @patch("paramiko.client.Transport")
+    def test_disable_algorithms_passed_directly_if_given(self, Transport):
+        SSHClient().connect(
+            "host",
+            sock=Mock(),
+            password="no",
+            disable_algorithms={"keys": ["ssh-dss"]},
+        )
+        call_arg = Transport.call_args[1]["disable_algorithms"]
+        assert call_arg == {"keys": ["ssh-dss"]}
+
 
 class PasswordPassphraseTests(ClientTest):
     # TODO: most of these could reasonably be set up to use mocks/assertions