forked from pool/python-pyftpdlib
24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
|
Index: b/pyftpdlib/test/test_functional_ssl.py
|
||
|
|
===================================================================
|
||
|
|
--- a/pyftpdlib/test/test_functional_ssl.py
|
||
|
|
+++ b/pyftpdlib/test/test_functional_ssl.py
|
||
|
|
@@ -344,13 +344,15 @@ class TestFTPS(unittest.TestCase):
|
||
|
|
self.client.quit()
|
||
|
|
|
||
|
|
def test_ssl_version(self):
|
||
|
|
- protos = [ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1]
|
||
|
|
+ protos = [ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1]
|
||
|
|
if hasattr(ssl, "PROTOCOL_SSLv2"):
|
||
|
|
protos.append(ssl.PROTOCOL_SSLv2)
|
||
|
|
for proto in protos:
|
||
|
|
self.try_protocol_combo(ssl.PROTOCOL_SSLv2, proto)
|
||
|
|
- for proto in protos:
|
||
|
|
- self.try_protocol_combo(ssl.PROTOCOL_SSLv3, proto)
|
||
|
|
+ if hasattr(ssl, "PROTOCOL_SSLv3"):
|
||
|
|
+ protos.append(ssl.PROTOCOL_SSLv3)
|
||
|
|
+ for proto in protos:
|
||
|
|
+ self.try_protocol_combo(ssl.PROTOCOL_SSLv3, proto)
|
||
|
|
for proto in protos:
|
||
|
|
self.try_protocol_combo(ssl.PROTOCOL_SSLv23, proto)
|
||
|
|
for proto in protos:
|