From 3ef18c12af40f9b37b5a1382b06a9c66434ed56b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 13 Jan 2010 15:18:52 +0000 Subject: Teach nsa about ssl git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@436 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede --- config.sample | 1 + nsa | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config.sample b/config.sample index 83754a0..6181947 100644 --- a/config.sample +++ b/config.sample @@ -7,6 +7,7 @@ nickservpassword: xxxxxxxxxxxxxxxx nickserv_is_smart: true port: 6667 + ssl: false mailin: /home/commit/Maildir projects: 'oftc': [ '#oftc' ] diff --git a/nsa b/nsa index 46d514d..45f32f2 100755 --- a/nsa +++ b/nsa @@ -22,6 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. require 'socket' +require 'openssl' require 'yaml' require 'monitor' @@ -65,7 +66,14 @@ class Connection @outQueue.extend(MonitorMixin) @outEmpty = @outQueue.new_cond - @sock = TCPSocket.new(CONFIG['irc']['server'], CONFIG['irc']['port']); + tcpsock = TCPSocket.new(CONFIG['irc']['server'], CONFIG['irc']['port']); + if CONFIG['irc']['ssl'] + ctx = OpenSSL::SSL::SSLContext.new + @sock = OpenSSL::SSL::SSLSocket.new(tcpsock, ctx) + @sock.connect + else + @sock = tcpsock + end puts "Connected!" createInThread -- cgit v1.2.3