Rooba
/
uvloop
mirror of https://github.com/MagicStack/uvloop.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prefer PROTOCOL_TLS than PROTOCOL_SSLv23

This commit is contained in:
Fantix King 2019-10-21 15:02:24 -05:00 committed by Yury Selivanov
parent d9ad177152
commit 5905f27a95
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/bench/echoclient.py
View File

@ -29,7 +29,10 @@ if __name__ == '__main__':
client_context = None
if args.ssl:
print('with SSL')
client_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
if hasattr(ssl, 'PROTOCOL_TLS'):
client_context = ssl.SSLContext(ssl.PROTOCOL_TLS)
else:
client_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
if hasattr(client_context, 'check_hostname'):
client_context.check_hostname = False
client_context.verify_mode = ssl.CERT_NONE

5
examples/bench/echoserver.py
View File

@ -143,7 +143,10 @@ if __name__ == '__main__':
server_context = None
if args.ssl:
print('with SSL')
server_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
if hasattr(ssl, 'PROTOCOL_TLS'):
server_context = ssl.SSLContext(ssl.PROTOCOL_TLS)
else:
server_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
server_context.load_cert_chain(
(pathlib.Path(__file__).parent.parent.parent /
'tests' / 'certs' / 'ssl_cert.pem'),

8
tests/test_tcp.py
View File

@ -1651,13 +1651,17 @@ class _TestSSL(tb.SSLTestCase):
self.fail("unexpected call to connection_made()")
def test_ssl_connect_accepted_socket(self):
server_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
if hasattr(ssl, 'PROTOCOL_TLS'):
proto = ssl.PROTOCOL_TLS
else:
proto = ssl.PROTOCOL_SSLv23
server_context = ssl.SSLContext(proto)
server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY)
if hasattr(server_context, 'check_hostname'):
server_context.check_hostname = False
server_context.verify_mode = ssl.CERT_NONE
client_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
client_context = ssl.SSLContext(proto)
if hasattr(server_context, 'check_hostname'):
client_context.check_hostname = False
client_context.verify_mode = ssl.CERT_NONE

5
uvloop/_testbase.py
View File

@ -271,7 +271,10 @@ def find_free_port(start_from=50000):
class SSLTestCase:
def _create_server_ssl_context(self, certfile, keyfile=None):
sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
if hasattr(ssl, 'PROTOCOL_TLS'):
sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS)
else:
sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
sslcontext.options |= ssl.OP_NO_SSLv2
sslcontext.load_cert_chain(certfile, keyfile)
return sslcontext