diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:13:20 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-11-04 10:13:20 -0500 |
| commit | d98f567c21286d8465852722f49520032ae3ec5b (patch) | |
| tree | 254bbdd8d8f3860f5b8ba3a19d0487568d427856 | |
| parent | 30a7afcdc74443c74f2ebb344a1fbf235c23bf57 (diff) | |
bad merge
| -rw-r--r-- | paramiko/transport.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py index 78102e76..629c1caf 100644 --- a/paramiko/transport.py +++ b/paramiko/transport.py @@ -147,12 +147,6 @@ class Transport (threading.Thread, ClosingContextManager): 'class': algorithms.AES, 'mode': modes.CTR, 'block-size': 16, - 'key-size': 16 - }, - 'aes256-ctr': { - 'class': AES, - 'mode': AES.MODE_CTR, - 'block-size': 16, 'key-size': 32 }, 'blowfish-cbc': { |