Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Torssl #113

Merged
merged 2 commits into from
Jun 29, 2015
Merged

Torssl #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c880eee
Merge pull request #1 from chris-belcher/master
abitfan Jun 19, 2015
2f54ced
Connect to hidden service with ssl
Jun 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/irc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,10 @@ def run(self):
self.sock = socks.socksocket()
else:
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect(self.serverport)
if config.get("MESSAGING","usessl").lower() == 'true':
self.sock = ssl.wrap_socket(self.sock)
self.fd = self.sock.makefile()
self.sock.connect(self.serverport)
self.password = None
if self.given_password:
self.password = self.given_password
Expand Down