crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cdd08e90b7 into 30942f12d3

This commit is contained in:
wiebeytec 2017-01-20 18:01:14 +00:00 committed by GitHub
parent 30942f12d3 cdd08e90b7
commit 094797ffe5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
websockify/websocket.py
View File

@ -837,11 +837,12 @@ class WebSocketServer(object):
% self.cert)
retsock = None
try:
retsock = ssl.wrap_socket(
sock,
server_side=True,
certfile=self.cert,
keyfile=self.key)
# This stuff only works in Python3. In the Python 2.7.4 in Ubuntu it's mighty hard to disable SSLv3, because of the lack of SSLContext
sslcontext = ssl.SSLContext(protocol=ssl.PROTOCOL_SSLv23) # SSLv23 is the deprecrated, python 3.4 compatible way of saying 'everything, also TLS'
sslcontext.load_cert_chain(certfile=self.cert, keyfile=self.key);
sslcontext.options |= ssl.OP_NO_SSLv3
retsock = sslcontext.wrap_socket(sock, server_side=True);
except ssl.SSLError:
_, x, _ = sys.exc_info()
if x.args[0] == ssl.SSL_ERROR_EOF: