Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Use ssl.create_default_context in Lib/test/ssl_servers.py

This commit is contained in:
Antoine Pitrou 2014-04-17 12:21:36 +02:00
parent 8bdeb1672c
commit 05649f39ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/ssl_servers.py
View File

@ -150,7 +150,7 @@ class HTTPSServerThread(threading.Thread):
def make_https_server(case, *, context=None, certfile=CERTFILE, def make_https_server(case, *, context=None, certfile=CERTFILE,
host=HOST, handler_class=None): host=HOST, handler_class=None):
if context is None: if context is None:
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
# We assume the certfile contains both private key and certificate # We assume the certfile contains both private key and certificate
context.load_cert_chain(certfile) context.load_cert_chain(certfile)
server = HTTPSServerThread(context, host, handler_class) server = HTTPSServerThread(context, host, handler_class)
@ -192,7 +192,7 @@ if __name__ == "__main__":
else: else:
handler_class = RootedHTTPRequestHandler handler_class = RootedHTTPRequestHandler
handler_class.root = os.getcwd() handler_class.root = os.getcwd()
context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
context.load_cert_chain(CERTFILE) context.load_cert_chain(CERTFILE)
if args.curve_name: if args.curve_name:
context.set_ecdh_curve(args.curve_name) context.set_ecdh_curve(args.curve_name)