summaryrefslogtreecommitdiff
path: root/paramiko/common.py
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2015-03-12 21:35:59 -0400
committerJeremy T. Bouse <jbouse@debian.org>2015-03-12 21:35:59 -0400
commit01653e8710c38f3066078b2773ad47ccb3670c58 (patch)
tree8284e75857a06945167186d09dd9021fd24c2ee1 /paramiko/common.py
parent74794f84c2d9906aea5024dfccd90482fff9bab3 (diff)
parentf784a533d6e1d09e89dc254f3493b491e19c94f0 (diff)
downloadpython-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar
python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar.gz
Merge tag 'upstream/1.15.2'
Upstream version 1.15.2
Diffstat (limited to 'paramiko/common.py')
-rw-r--r--paramiko/common.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/paramiko/common.py b/paramiko/common.py
index 97b2f95..0b0cc2a 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -195,7 +195,11 @@ DEFAULT_MAX_PACKET_SIZE = 2 ** 15
# lower bound on the max packet size we'll accept from the remote host
# Minimum packet size is 32768 bytes according to
# http://www.ietf.org/rfc/rfc4254.txt
-MIN_PACKET_SIZE = 2 ** 15
+MIN_WINDOW_SIZE = 2 ** 15
+
+# However, according to http://www.ietf.org/rfc/rfc4253.txt it is perfectly
+# legal to accept a size much smaller, as OpenSSH client does as size 16384.
+MIN_PACKET_SIZE = 2 ** 12
# Max windows size according to http://www.ietf.org/rfc/rfc4254.txt
MAX_WINDOW_SIZE = 2**32 -1