From fb81db184e8b5f9f1a8e563d7d35a48c0386401f Mon Sep 17 00:00:00 2001
From: MaelkMark <110915409+MaelkMark@users.noreply.github.com>
Date: Thu, 3 Apr 2025 17:33:06 +0200
Subject: [PATCH] Updated WebSocketHandler ssl to work with Python 3.12+

Replaced ssl.wrap_socket() with the new ssl.SSLContext approach in WebSocketHandler __init__ as Python 3.12+ no longer supports the ssl.wrap_socket() function.
---
 websocket_server/websocket_server.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/websocket_server/websocket_server.py b/websocket_server/websocket_server.py
index 083ee17..c954c34 100644
--- a/websocket_server/websocket_server.py
+++ b/websocket_server/websocket_server.py
@@ -265,9 +265,13 @@ def __init__(self, socket, addr, server):
         self._send_lock = threading.Lock()
         if server.key and server.cert:
             try:
-                socket = ssl.wrap_socket(socket, server_side=True, certfile=server.cert, keyfile=server.key)
-            except: # Not sure which exception it throws if the key/cert isn't found
-                logger.warning("SSL not available (are the paths {} and {} correct for the key and cert?)".format(server.key, server.cert))
+                ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+                ssl_context.load_cert_chain(certfile=server.cert, keyfile=server.key)
+                socket = ssl_context.wrap_socket(socket, server_side=True)
+            except FileNotFoundError:
+                logger.warning("SSL key or certificate file not found. Please check the paths for the key and cert.")
+            except ssl.SSLError as e:
+                logger.warning(f"SSL error occurred: {e}")
         StreamRequestHandler.__init__(self, socket, addr, server)
 
     def setup(self):