GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into devel

Browse Source
This commit is contained in:
James Lu 2016-06-27 21:47:55 -07:00
commit 9374bccb6f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes.py
View File

@ -197,9 +197,13 @@ class Irc():
keyfile = self.serverdata.get('ssl_keyfile') keyfile = self.serverdata.get('ssl_keyfile')
if certfile and keyfile: if certfile and keyfile:
try: try:
self.socket = ssl.wrap_socket(self.socket, context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
certfile=certfile, # Disable SSLv2 and SSLv3 - these are insecure
keyfile=keyfile) context.options |= ssl.OP_NO_SSLv2
context.options |= ssl.OP_NO_SSLv3
context.load_cert_chain(certfile, keyfile)
self.socket = context.wrap_socket(self.socket)
except OSError: except OSError:
log.exception('(%s) Caught OSError trying to ' log.exception('(%s) Caught OSError trying to '
'initialize the SSL connection; ' 'initialize the SSL connection; '