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

Only accept PROTOCOL_TLS as SSL handshake version

Browse source
This commit is contained in:
jesopo 2018-09-19 14:44:28 +01:00
parent ecb8698fb7
commit 7108b05bc0
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
IRCServer.py
View file

@ -6,10 +6,6 @@ THROTTLE_SECONDS = 1
READ_TIMEOUT_SECONDS = 120 READ_TIMEOUT_SECONDS = 120
PING_INTERVAL_SECONDS = 30 PING_INTERVAL_SECONDS = 30
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, bot, events, id, alias, hostname, port, password, def __init__(self, bot, events, id, alias, hostname, port, password,
ipv4, tls, nickname, username, realname): ipv4, tls, nickname, username, realname):
@ -84,7 +80,7 @@ class Server(object):
return self.cached_fileno if fileno == -1 else fileno return self.cached_fileno if fileno == -1 else fileno
def tls_wrap(self): def tls_wrap(self):
context = ssl.SSLContext(OUR_TLS_PROTOCOL) context = ssl.SSLContext(ssl.PROTOCOL_TLS)
context.options |= ssl.OP_NO_SSLv2 context.options |= ssl.OP_NO_SSLv2
context.options |= ssl.OP_NO_SSLv3 context.options |= ssl.OP_NO_SSLv3
context.options |= ssl.OP_NO_TLSv1 context.options |= ssl.OP_NO_TLSv1