From 2313a8af25195cc692324e8a66b473ca28a1a1cf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 14 Nov 2018 14:00:21 -0700 Subject: [PATCH] Pass ClientContextFactory to TorSocksEndpoint --- jmdaemon/jmdaemon/irc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jmdaemon/jmdaemon/irc.py b/jmdaemon/jmdaemon/irc.py index 88eccc1..9307d44 100644 --- a/jmdaemon/jmdaemon/irc.py +++ b/jmdaemon/jmdaemon/irc.py @@ -128,9 +128,10 @@ class IRCMessageChannel(MessageChannel): wlog('building irc') if self.tx_irc_client: raise Exception('irc already built') + if self.usessl.lower() == 'true': + ctx = ClientContextFactory() if self.usessl.lower() == 'true' and not self.socks5.lower() == 'true': factory = TxIRCFactory(self) - ctx = ClientContextFactory() reactor.connectSSL(self.serverport[0], self.serverport[1], factory, ctx) elif self.socks5.lower() == 'true': @@ -139,7 +140,7 @@ class IRCMessageChannel(MessageChannel): torEndpoint = TCP4ClientEndpoint(reactor, str(self.socks5_host), self.socks5_port) if self.usessl.lower() == 'true': - use_tls = True + use_tls = ctx else: use_tls = False ircEndpoint = TorSocksEndpoint(torEndpoint, self.serverport[0],