diff options
| author | Pierce Lopez <pierce.lopez@gmail.com> | 2017-06-06 15:30:36 -0400 |
|---|---|---|
| committer | Pierce Lopez <pierce.lopez@gmail.com> | 2017-06-06 15:52:02 -0400 |
| commit | c1233679c448b445ec991710d259eec0a9f64b61 (patch) | |
| tree | c3c91a26594ae07e5b6d5c1479cb3e7466382ca3 | |
| parent | 9d2af83f1474fd594f3dd1fea20839a9751a6a4b (diff) | |
transport: change order of preferred kex and hmac algorithms
to match the openssh client
| -rw-r--r-- | paramiko/transport.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 7693c354..b6200933 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -120,10 +120,10 @@ class Transport(threading.Thread, ClosingContextManager): _preferred_macs = ( 'hmac-sha2-256', 'hmac-sha2-512', + 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96', - 'hmac-sha1', ) _preferred_keys = ( 'ecdsa-sha2-nistp256', @@ -134,13 +134,13 @@ class Transport(threading.Thread, ClosingContextManager): 'ssh-dss', ) _preferred_kex = ( - 'diffie-hellman-group1-sha1', - 'diffie-hellman-group14-sha1', - 'diffie-hellman-group-exchange-sha1', - 'diffie-hellman-group-exchange-sha256', 'ecdh-sha2-nistp256', 'ecdh-sha2-nistp384', 'ecdh-sha2-nistp521', + 'diffie-hellman-group-exchange-sha256', + 'diffie-hellman-group-exchange-sha1', + 'diffie-hellman-group14-sha1', + 'diffie-hellman-group1-sha1', ) _preferred_compression = ('none',) |