From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Vibhav Pant Newsgroups: gmane.emacs.devel Subject: [PATCH] Add option to ERC to make all connections use SSL. Date: Wed, 30 Jul 2014 14:49:52 +0530 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11c23056a011a904ff65a8d8 X-Trace: ger.gmane.org 1406712014 2608 80.91.229.3 (30 Jul 2014 09:20:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Jul 2014 09:20:14 +0000 (UTC) To: "emacs-devel@gnu.org" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 30 11:20:07 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XCQ3L-0004qf-8I for ged-emacs-devel@m.gmane.org; Wed, 30 Jul 2014 11:20:07 +0200 Original-Received: from localhost ([::1]:49876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCQ3K-00079O-KQ for ged-emacs-devel@m.gmane.org; Wed, 30 Jul 2014 05:20:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCQ3H-00078D-5T for emacs-devel@gnu.org; Wed, 30 Jul 2014 05:20:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCQ39-00026F-0P for emacs-devel@gnu.org; Wed, 30 Jul 2014 05:20:03 -0400 Original-Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:55717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCQ38-00025v-Jy for emacs-devel@gnu.org; Wed, 30 Jul 2014 05:19:54 -0400 Original-Received: by mail-pd0-f175.google.com with SMTP id r10so1145780pdi.20 for ; Wed, 30 Jul 2014 02:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=hZmHI6nJu3whD/sOlaDhJ0zouCvDJHyv6VT9lbp+iKM=; b=OnU+8hA5SEjYhJ1H2W34l6XkPhaTQurbX0EkTCZvsui2WZU7IuMgzLyUanuvS6OWZo BmRk/RAIEStAP9/ks0CuSzX9yPCs2DbnIyf18oMGICJWkC9iic5TjrArqKr0HAkBNu71 MvoAy+oJV3u4BqhAKfpLb3MdmJtWAPV6WTtYsbZWG6SXeQLyvQtOmI7evWa7dBnghs4q ulxrp0f40XjMe7R96rRNfn5UlumCXiiup3n142ddgJD6stGu2JUkHontZrdrUxhwM0UP Hr2odWaVzvMnsPNGXLGQG/o07WFWq9E+OafegPWoiXoXtEwGgDAZf1ssvCwolZeALA5m gEvA== X-Received: by 10.70.90.7 with SMTP id bs7mr2914997pdb.141.1406711992677; Wed, 30 Jul 2014 02:19:52 -0700 (PDT) Original-Received: by 10.70.34.230 with HTTP; Wed, 30 Jul 2014 02:19:52 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173276 Archived-At: --001a11c23056a011a904ff65a8d8 Content-Type: text/plain; charset=ISO-8859-1 Hello, Presently, ERC can connect to IRC netowrks using SSL via the function 'erc-tls'. However, it can be confusing for new users to find this function, so I have added a patch to erc.el which adds an option (erc-use-ssl) to make all connections use SSL. Its value can be changed from the customize group "erc". (The default value is nil). diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3bd9ff3..458892a 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -222,6 +222,11 @@ prompt you for it.") :group 'erc :type 'boolean) +(defcustom erc-use-ssl nil + "If set to non-nill, use SSL to connect to all networks." + :group 'erc + :type 'boolean) + (defcustom erc-hide-prompt nil "If non-nil, do not display the prompt for commands. @@ -2145,10 +2150,10 @@ functions in here get called with the paramete ;;;###autoload (cl-defun erc (&key (server (erc-compute-server)) - (port (erc-compute-port)) - (nick (erc-compute-nick)) - password - (full-name (erc-compute-full-name))) + (port (erc-compute-port)) + (nick (erc-compute-nick)) + password + (full-name (erc-compute-full-name))) "ERC is a powerful, modular, and extensible IRC client. This function is the main entry point for ERC. @@ -2169,7 +2174,9 @@ then the server and full-name will be set to tho `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' wi be invoked for the values of the other parameters." (interactive (erc-select-read-args)) - (erc-open server port nick full-name t password)) + (let ((erc-server-connect-function (if erc-use-ssl 'erc-open-tls-st + 'erc-server-connect-function))) + (erc-open server port nick full-name t password))) ;;;###autoload (defalias 'erc-select 'erc) -- Vibhav Pant vibhavp@gmail.com --001a11c23056a011a904ff65a8d8 Content-Type: text/x-patch; charset=US-ASCII; name="erc-ssl-option.patch" Content-Disposition: attachment; filename="erc-ssl-option.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hy8rqp2d0 ZGlmZiAtLWdpdCBhL2xpc3AvZXJjL2VyYy5lbCBiL2xpc3AvZXJjL2VyYy5lbAppbmRleCAzYmQ5 ZmYzLi40NTg4OTJhIDEwMDY0NAotLS0gYS9saXNwL2VyYy9lcmMuZWwKKysrIGIvbGlzcC9lcmMv ZXJjLmVsCkBAIC0yMjIsNiArMjIyLDExIEBAIHByb21wdCB5b3UgZm9yIGl0LiIpCiAgIDpncm91 cCAnZXJjCiAgIDp0eXBlICdib29sZWFuKQogCisoZGVmY3VzdG9tIGVyYy11c2Utc3NsIG5pbAor ICAiSWYgc2V0IHRvIG5vbi1uaWxsLCB1c2UgU1NMIHRvIGNvbm5lY3QgdG8gYWxsIG5ldHdvcmtz LiIKKyAgOmdyb3VwICdlcmMKKyAgOnR5cGUgJ2Jvb2xlYW4pCisKIChkZWZjdXN0b20gZXJjLWhp ZGUtcHJvbXB0IG5pbAogICAiSWYgbm9uLW5pbCwgZG8gbm90IGRpc3BsYXkgdGhlIHByb21wdCBm b3IgY29tbWFuZHMuCiAKQEAgLTIxNDUsMTAgKzIxNTAsMTAgQEAgZnVuY3Rpb25zIGluIGhlcmUg Z2V0IGNhbGxlZCB3aXRoIHRoZSBwYXJhbWV0ZXJzIFNFUlZFUiBhbmQgTklDSy4iCiAKIDs7OyMj I2F1dG9sb2FkCiAoY2wtZGVmdW4gZXJjICgma2V5IChzZXJ2ZXIgKGVyYy1jb21wdXRlLXNlcnZl cikpCi0gICAgICAgICAgICAgICAgICAgIChwb3J0ICAgKGVyYy1jb21wdXRlLXBvcnQpKQotICAg ICAgICAgICAgICAgICAgICAobmljayAgIChlcmMtY29tcHV0ZS1uaWNrKSkKLSAgICAgICAgICAg ICAgICAgICAgcGFzc3dvcmQKLSAgICAgICAgICAgICAgICAgICAgKGZ1bGwtbmFtZSAoZXJjLWNv bXB1dGUtZnVsbC1uYW1lKSkpCisJCSAgICAocG9ydCAgIChlcmMtY29tcHV0ZS1wb3J0KSkKKwkJ ICAgIChuaWNrICAgKGVyYy1jb21wdXRlLW5pY2spKQorCQkgICAgcGFzc3dvcmQKKwkJICAgIChm dWxsLW5hbWUgKGVyYy1jb21wdXRlLWZ1bGwtbmFtZSkpKQogICAiRVJDIGlzIGEgcG93ZXJmdWws IG1vZHVsYXIsIGFuZCBleHRlbnNpYmxlIElSQyBjbGllbnQuCiBUaGlzIGZ1bmN0aW9uIGlzIHRo ZSBtYWluIGVudHJ5IHBvaW50IGZvciBFUkMuCiAKQEAgLTIxNjksNyArMjE3NCw5IEBAIHRoZW4g dGhlIHNlcnZlciBhbmQgZnVsbC1uYW1lIHdpbGwgYmUgc2V0IHRvIHRob3NlIHZhbHVlcywgd2hl cmVhcwogYGVyYy1jb21wdXRlLXBvcnQnLCBgZXJjLWNvbXB1dGUtbmljaycgYW5kIGBlcmMtY29t cHV0ZS1mdWxsLW5hbWUnIHdpbGwKIGJlIGludm9rZWQgZm9yIHRoZSB2YWx1ZXMgb2YgdGhlIG90 aGVyIHBhcmFtZXRlcnMuIgogICAoaW50ZXJhY3RpdmUgKGVyYy1zZWxlY3QtcmVhZC1hcmdzKSkK LSAgKGVyYy1vcGVuIHNlcnZlciBwb3J0IG5pY2sgZnVsbC1uYW1lIHQgcGFzc3dvcmQpKQorICAo bGV0ICgoZXJjLXNlcnZlci1jb25uZWN0LWZ1bmN0aW9uIChpZiBlcmMtdXNlLXNzbCAnZXJjLW9w ZW4tdGxzLXN0cmVhbQorCQkJCSAgICAgICAnZXJjLXNlcnZlci1jb25uZWN0LWZ1bmN0aW9uKSkp CisgICAgKGVyYy1vcGVuIHNlcnZlciBwb3J0IG5pY2sgZnVsbC1uYW1lIHQgcGFzc3dvcmQpKSkg CiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmYWxpYXMgJ2VyYy1zZWxlY3QgJ2VyYykK --001a11c23056a011a904ff65a8d8--