Skip to content

Commit fea2a25

Browse files
committed
Correct wrap_socket call for Python 3.12
Signed-off-by: Aarni Koskela <[email protected]>
1 parent 172f01e commit fea2a25

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Diff for: test/paho_test.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def create_server_socket():
3434
return sock
3535

3636

37-
def create_server_socket_ssl(*args, **kwargs):
37+
def create_server_socket_ssl(cert_reqs=None):
3838
if ssl is None:
3939
raise RuntimeError
4040

@@ -46,10 +46,13 @@ def create_server_socket_ssl(*args, **kwargs):
4646

4747
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
4848
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
49-
ssock = ssl.wrap_socket(
50-
sock, ca_certs="../ssl/all-ca.crt",
51-
keyfile="../ssl/server.key", certfile="../ssl/server.crt",
52-
server_side=True, ssl_version=ssl_version, **kwargs)
49+
context = ssl.SSLContext(ssl_version)
50+
context.load_verify_locations("../ssl/all-ca.crt")
51+
context.load_cert_chain("../ssl/server.crt", "../ssl/server.key")
52+
if cert_reqs:
53+
context.verify_mode = cert_reqs
54+
55+
ssock = context.wrap_socket(sock, server_side=True)
5356
ssock.settimeout(10)
5457
ssock.bind(('', 1888))
5558
ssock.listen(5)

0 commit comments

Comments
 (0)