summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-06-06 16:22:21 -0400
committerGitHub <noreply@github.com>2017-06-06 16:22:21 -0400
commitb395444062e82953d417a4da9157667c2e05d758 (patch)
tree4a1f2e7dc055bf0971250e12ef45cf5cb04102e0
parent5a4405c87ef7f2d4d428efafc1ac57626c71df60 (diff)
Reorder cipher and key preferences to make more sense
-rw-r--r--paramiko/transport.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 67c52e6a..c92260c9 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -109,9 +109,9 @@ class Transport(threading.Thread, ClosingContextManager):
'aes192-ctr',
'aes256-ctr',
'aes128-cbc',
- 'blowfish-cbc',
'aes192-cbc',
'aes256-cbc',
+ 'blowfish-cbc',
'3des-cbc',
)
_preferred_macs = (
@@ -123,10 +123,10 @@ class Transport(threading.Thread, ClosingContextManager):
'hmac-sha1',
)
_preferred_keys = (
+ 'ssh-ed25519',
'ecdsa-sha2-nistp256',
'ecdsa-sha2-nistp384',
'ecdsa-sha2-nistp521',
- 'ssh-ed25519',
'ssh-rsa',
'ssh-dss',
)