summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPierce Lopez <pierce.lopez@gmail.com>2017-02-20 15:48:19 -0500
committerJeff Forcier <jeff@bitprophet.org>2017-06-05 19:55:02 -0700
commitf499b43cffb855f09b426c7eaa3bcea849700a87 (patch)
tree12b89cbecab4e2e73da2ba05f9f7a7407983830a
parentcbec93b9a466ec8dad856f89e90e5401e70730b6 (diff)
Transport: prefer ecdsa server host keys over rsa
openssh client seems to prefer ecdsa server host keys (even over ssh-ed25519)
-rw-r--r--paramiko/transport.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 5ab24980..a308e0c9 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -122,9 +122,12 @@ class Transport (threading.Thread, ClosingContextManager):
'hmac-sha1',
)
_preferred_keys = (
+ 'ecdsa-sha2-nistp256',
+ 'ecdsa-sha2-nistp384',
+ 'ecdsa-sha2-nistp521',
'ssh-rsa',
'ssh-dss',
- ) + tuple(ECDSAKey.supported_key_format_identifiers())
+ )
_preferred_kex = (
'diffie-hellman-group1-sha1',
'diffie-hellman-group14-sha1',