diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-04 16:20:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-04 16:20:16 (GMT) |
| commit | 9fe67ceebf697f8a49854badf704ceee122968cf (patch) | |
| tree | b364541553b1603a8377d61b58b085935cb7d4ee /Lib/ftplib.py | |
| parent | c1edb585a2cdb53bd8be38f435358c128f8b4e5b (diff) | |
| download | cpython-9fe67ceebf697f8a49854badf704ceee122968cf.zip cpython-9fe67ceebf697f8a49854badf704ceee122968cf.tar.gz cpython-9fe67ceebf697f8a49854badf704ceee122968cf.tar.bz2 | |
make SSLv23 the default version in 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 c98290c..0a69b7a 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -638,7 +638,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, timeout=_GLOBAL_DEFAULT_TIMEOUT): @@ -656,7 +656,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') |