# HG changeset patch
# User Edouard Tisserant
# Date 1539948892 -7200
# Node ID b7330f3461ddb6f6903f26664d1dbcc0db219787
# Parent  523559fe635257acbb239b70a77f7b8438c02c34# Parent  5416c76df9e2c9a4f196422c321f85cdb42b7eec
merge

diff -r 523559fe6352 -r b7330f3461dd connectors/PYRO/PSK_Adapter.py
--- a/connectors/PYRO/PSK_Adapter.py	Thu Oct 18 18:37:01 2018 +0200
+++ b/connectors/PYRO/PSK_Adapter.py	Fri Oct 19 13:34:52 2018 +0200
@@ -28,7 +28,8 @@
                 _connect_socket(raw_sock, URI.address, URI.port, self.timeout)
                 sock = sslpsk.wrap_socket(
                     raw_sock, psk=Pyro.config.PYROPSK, server_side=False,
-                    ciphers="PSK-AES256-GCM-SHA384:PSK-AES256-CBC-SHA")
+                    ciphers="PSK-AES256-GCM-SHA384:PSK-AES256-CBC-SHA",
+                    ssl_version=ssl.PROTOCOL_TLSv1)
                 # all the rest is the same as in Pyro/protocol.py 
 
                 conn=TCPConnection(sock, sock.getpeername())