Commit 9fe67cee authored by Benjamin Peterson's avatar Benjamin Peterson

make SSLv23 the default version in ftplib (closes #23111)

parent c1edb585
...@@ -384,7 +384,7 @@ FTP_TLS Objects ...@@ -384,7 +384,7 @@ FTP_TLS Objects
.. attribute:: FTP_TLS.ssl_version .. attribute:: FTP_TLS.ssl_version
The SSL version to use (defaults to *TLSv1*). The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`).
.. method:: FTP_TLS.auth() .. method:: FTP_TLS.auth()
......
...@@ -638,7 +638,7 @@ else: ...@@ -638,7 +638,7 @@ else:
'221 Goodbye.' '221 Goodbye.'
>>> >>>
''' '''
ssl_version = ssl.PROTOCOL_TLSv1 ssl_version = ssl.PROTOCOL_SSLv23
def __init__(self, host='', user='', passwd='', acct='', keyfile=None, def __init__(self, host='', user='', passwd='', acct='', keyfile=None,
certfile=None, timeout=_GLOBAL_DEFAULT_TIMEOUT): certfile=None, timeout=_GLOBAL_DEFAULT_TIMEOUT):
...@@ -656,7 +656,7 @@ else: ...@@ -656,7 +656,7 @@ else:
'''Set up secure control connection by using TLS/SSL.''' '''Set up secure control connection by using TLS/SSL.'''
if isinstance(self.sock, ssl.SSLSocket): if isinstance(self.sock, ssl.SSLSocket):
raise ValueError("Already using TLS") raise ValueError("Already using TLS")
if self.ssl_version == ssl.PROTOCOL_TLSv1: if self.ssl_version >= ssl.PROTOCOL_SSLv23:
resp = self.voidcmd('AUTH TLS') resp = self.voidcmd('AUTH TLS')
else: else:
resp = self.voidcmd('AUTH SSL') resp = self.voidcmd('AUTH SSL')
......
...@@ -15,6 +15,8 @@ Core and Builtins ...@@ -15,6 +15,8 @@ Core and Builtins
Library Library
------- -------
- Issue #23111: Maximize compatibility in protocol versions of ftplib.FTP_TLS.
- Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and - Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and
fragment when it redirects to add a trailing slash. fragment when it redirects to add a trailing slash.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment