diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-12-30 15:15:43 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-12-30 15:15:43 -0600 |
| commit | 36fe7926f888ba154b64904b91a5dd8c83e6c167 (patch) | |
| tree | 52d4535826386783b6a5f1e3598f4586d1a8c0c2 /Lib/ftplib.py | |
| parent | 3cd1af51f67d56874529a4581e9cdbd3c7277cee (diff) | |
| download | cpython-git-36fe7926f888ba154b64904b91a5dd8c83e6c167.tar.gz | |
make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111)
Diffstat (limited to 'Lib/ftplib.py')
| -rw-r--r-- | Lib/ftplib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 9c73f5f019..cd8c1a987e 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -713,7 +713,7 @@ else: '221 Goodbye.' >>> ''' - ssl_version = ssl.PROTOCOL_TLSv1 + ssl_version = ssl.PROTOCOL_SSLv23 def __init__(self, host='', user='', passwd='', acct='', keyfile=None, certfile=None, context=None, @@ -743,7 +743,7 @@ else: '''Set up secure control connection by using TLS/SSL.''' if isinstance(self.sock, ssl.SSLSocket): raise ValueError("Already using TLS") - if self.ssl_version == ssl.PROTOCOL_TLSv1: + if self.ssl_version >= ssl.PROTOCOL_SSLv23: resp = self.voidcmd('AUTH TLS') else: resp = self.voidcmd('AUTH SSL') |