diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-01 13:25:58 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-01 13:25:58 -0800 |
| commit | 380aaa3631a0b2a197987d0c5c6163be418e128d (patch) | |
| tree | de2b14ea25093e1c88d6067f5eab70c15f5f309a | |
| parent | 013ec610643f56f737fe7d1d4ac0f33f09bb3f4a (diff) | |
Reformat algorithm tuples for readability, & add ordering comment
| -rw-r--r-- | paramiko/transport.py | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 2f90cdfa..e2a0c0ff 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -94,15 +94,36 @@ class Transport (threading.Thread, ClosingContextManager): _PROTO_ID = '2.0' _CLIENT_ID = 'paramiko_%s' % paramiko.__version__ - _preferred_ciphers = ('aes128-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', - 'aes256-cbc', '3des-cbc', 'arcfour128', 'arcfour256') - _preferred_macs = ('hmac-sha2-256', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96', - 'hmac-sha1') - _preferred_keys = ('ssh-rsa', 'ssh-dss', 'ecdsa-sha2-nistp256') - _preferred_kex = ('diffie-hellman-group1-sha1', - 'diffie-hellman-group14-sha1', - 'diffie-hellman-group-exchange-sha1', - 'diffie-hellman-group-exchange-sha256') + # These tuples of algorithm identifiers are in preference order; do not + # reorder without reason! + _preferred_ciphers = ( + 'aes128-ctr', + 'aes256-ctr', + 'aes128-cbc', + 'blowfish-cbc', + 'aes256-cbc', + '3des-cbc', + 'arcfour128', + 'arcfour256', + ) + _preferred_macs = ( + 'hmac-sha2-256', + 'hmac-md5', + 'hmac-sha1-96', + 'hmac-md5-96', + 'hmac-sha1', + ) + _preferred_keys = ( + 'ssh-rsa', + 'ssh-dss', + 'ecdsa-sha2-nistp256', + ) + _preferred_kex = ( + 'diffie-hellman-group1-sha1', + 'diffie-hellman-group14-sha1', + 'diffie-hellman-group-exchange-sha1', + 'diffie-hellman-group-exchange-sha256', + ) _preferred_compression = ('none',) _cipher_info = { |