diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 10:23:02 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 10:23:02 -0800 |
| commit | 7030ad9f8d2497761bcbf7d1bc97d41a5041cb2a (patch) | |
| tree | 59b9c31fda3e319d519208001fc2938b65ac521f | |
| parent | 6f3ea41cbc559cbf1db92eeebcb4ec3432182299 (diff) | |
Port #604 to latest master
| -rw-r--r-- | paramiko/transport.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index b60fe85f..c5054dea 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -98,9 +98,11 @@ class Transport (threading.Thread, ClosingContextManager): # reorder without reason! _preferred_ciphers = ( 'aes128-ctr', + 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'blowfish-cbc', + 'aes192-cbc', 'aes256-cbc', '3des-cbc', 'arcfour128', @@ -134,6 +136,12 @@ class Transport (threading.Thread, ClosingContextManager): 'block-size': 16, 'key-size': 16 }, + 'aes192-ctr': { + 'class': AES, + 'mode': AES.MODE_CTR, + 'block-size': 16, + 'key-size': 24 + }, 'aes256-ctr': { 'class': AES, 'mode': AES.MODE_CTR, @@ -152,6 +160,12 @@ class Transport (threading.Thread, ClosingContextManager): 'block-size': 16, 'key-size': 16 }, + 'aes192-cbc': { + 'class': AES, + 'mode': AES.MODE_CBC, + 'block-size': 16, + 'key-size': 24 + }, 'aes256-cbc': { 'class': AES, 'mode': AES.MODE_CBC, |