Do not use ssl.wrap_socket removed in Python 3.12

Fixes beaker-project#188 Signed-off-by: Michael Hofmann <mhofmann@redhat.com>
StykMartin · Nov 17, 2023 · cd2b74b · cd2b74b
1 parent 9551a07
commit cd2b74b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Common/bkr/common/xmlrpc2.py b/Common/bkr/common/xmlrpc2.py
@@ -114,7 +114,10 @@ def begin(self):
             self.close()
             raise socket.error(1001, response.status, response.msg)
 
-        self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file)
+        context = ssl.create_default_context()
+        if self.cert_file:
+            context.load_cert_chain(self.cert_file, self.key_file)
+        self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host)
 
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         return TimeoutHTTPConnection.putrequest(self, method, url)

diff --git a/Common/bkr/common/xmlrpc3.py b/Common/bkr/common/xmlrpc3.py
@@ -116,7 +116,10 @@ def begin(self):
             self.close()
             raise socket.error(1001, response.status, response.msg)
 
-        self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file)
+        context = ssl.create_default_context()
+        if self.cert_file:
+            context.load_cert_chain(self.cert_file, self.key_file)
+        self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host)
 
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         return TimeoutHTTPConnection.putrequest(self, method, url)