make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111)
This commit is contained in:
parent
3cd1af51f6
commit
36fe7926f8
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue