From fa495fe34c0dc65ed235c6585b4109ebefc98ad8 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 26 Jun 2024 20:54:37 +0200 Subject: [PATCH] Python3.12: do not use ssl.wrap_socket The ssl.wrap_socket method has been removed in 3.12. SSLContext.wrap_socket should now be used. Change-Id: Ided77a9c9b8e409105de18abf195405927a3684f --- glanceclient/tests/unit/test_ssl.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/glanceclient/tests/unit/test_ssl.py b/glanceclient/tests/unit/test_ssl.py index f95e777..8641f3d 100644 --- a/glanceclient/tests/unit/test_ssl.py +++ b/glanceclient/tests/unit/test_ssl.py @@ -45,12 +45,11 @@ class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer): cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt') cacert = os.path.join(TEST_VAR_DIR, 'ca.crt') (_sock, addr) = socketserver.TCPServer.get_request(self) - sock = ssl.wrap_socket(_sock, - certfile=cert_file, - keyfile=key_file, - ca_certs=cacert, - server_side=True, - cert_reqs=ssl.CERT_REQUIRED) + context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.verify_mode = ssl.CERT_REQUIRED + context.load_verify_locations(cacert) + context.load_cert_chain(cert_file, key_file) + sock = context.wrap_socket(_sock, server_side=True) return sock, addr