Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Handle versions of python that don't have ssl.PROTOCOL_TLS

Browse source
This commit is contained in:
jesopo 2017-11-01 14:04:49 +00:00
parent d6134d71a3
commit 4779c885c8
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
IRCServer.py
View file

@ -1,6 +1,10 @@
import collections, socket, ssl, sys, time import collections, socket, ssl, sys, time
import IRCChannel, IRCLineHandler, IRCUser import IRCChannel, IRCLineHandler, IRCUser
OUR_TLS_PROTOCOL = ssl.PROTOCOL_SSLv23
if hasattr(ssl, "PROTOCOL_TLS"):
OUR_TLS_PROTOCOL = ssl.PROTOCOL_TLS
class Server(object): class Server(object):
def __init__(self, id, hostname, port, password, ipv4, tls, def __init__(self, id, hostname, port, password, ipv4, tls,
nickname, username, realname, bot): nickname, username, realname, bot):
@ -38,7 +42,7 @@ class Server(object):
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
self.socket.settimeout(5.0) self.socket.settimeout(5.0)
if self.tls: if self.tls:
context = ssl.SSLContext(ssl.PROTOCOL_TLS) context = ssl.SSLContext(OUR_TLS_PROTOCOL)
context.options |= ssl.OP_NO_SSLv2 context.options |= ssl.OP_NO_SSLv2
context.options |= ssl.OP_NO_SSLv3 context.options |= ssl.OP_NO_SSLv3
self.socket = context.wrap_socket(self.socket) self.socket = context.wrap_socket(self.socket)