diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:00:48 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 14:00:48 -0700 |
| commit | 645c540d9bc489a77efb5b17d92ff4d59cf62f80 (patch) | |
| tree | 63cca9ce5f7fae099da625670066f61bc6476aa5 | |
| parent | 70874d6662e37d9b046ce9856f74cda7f70b5be9 (diff) | |
| parent | b808d5e6eb7e5cc3ab6cc71b7b25a1feb543bdfc (diff) | |
Merge branch '2.0' into 2.1
| -rw-r--r-- | paramiko/transport.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index f6f6aece..b99eb74b 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -107,9 +107,9 @@ class Transport(threading.Thread, ClosingContextManager): 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', - 'blowfish-cbc', 'aes192-cbc', 'aes256-cbc', + 'blowfish-cbc', '3des-cbc', ) _preferred_macs = ( diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index ec547b58..14b25429 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :bug:`984` Enhance default cipher preference order such that + ``aes(192|256)-cbc`` are preferred over ``blowfish-cbc``. Thanks to Alex + Gaynor. * :bug:`971 (1.17+)` Allow any type implementing the buffer API to be used with `BufferedFile <paramiko.file.BufferedFile>`, `Channel <paramiko.channel.Channel>`, and `SFTPFile <paramiko.sftp_file.SFTPFile>`. |