X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fio_tcp.py;h=09b9db1bbf3d0f47539a2c4aaea27aacd9c0c18c;hb=478d293913c37ed1bc98ab65db9658c58d6f7081;hp=b030f1b9f1c98332084763812bf152666004bb7a;hpb=81d69377ef8309ffdfda6a744a7375006521f29e;p=plomrogue2-experiments
diff --git a/new2/plomrogue/io_tcp.py b/new2/plomrogue/io_tcp.py
index b030f1b..09b9db1 100644
--- a/new2/plomrogue/io_tcp.py
+++ b/new2/plomrogue/io_tcp.py
@@ -103,14 +103,12 @@ class PlomSocket:
class PlomSocketSSL(PlomSocket):
- def __init__(self, *args, server_side=False, certfile=None, keyfile=None, **kwargs):
+ def __init__(self, *args, certfile, keyfile, **kwargs):
import ssl
super().__init__(*args, **kwargs)
- if server_side:
- self.socket = ssl.wrap_socket(self.socket, server_side=True,
- certfile=certfile, keyfile=keyfile)
- else:
- self.socket = ssl.wrap_socket(self.socket)
+ self.send('NEED_SSL')
+ self.socket = ssl.wrap_socket(self.socket, server_side=True,
+ certfile=certfile, keyfile=keyfile)
@@ -149,7 +147,6 @@ class IO_Handler(socketserver.BaseRequestHandler):
import threading
if self.server.socket_class == PlomSocketSSL:
plom_socket = self.server.socket_class(self.request,
- server_side=True,
certfile=self.server.certfile,
keyfile=self.server.keyfile)
else:
@@ -197,7 +194,7 @@ class PlomTCPServer(socketserver.ThreadingTCPServer):
class PlomTCPServerSSL(PlomTCPServer):
- def __init__(self, *args, certfile=None, keyfile=None, **kwargs):
+ def __init__(self, *args, certfile, keyfile, **kwargs):
super().__init__(*args, host='0.0.0.0', **kwargs)
self.certfile = certfile
self.keyfile = keyfile