← Back to branch summary

~ubuntu-branches/ubuntu/utopic/irssi-plugin-xmpp/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/require-starttls.patch

  • Committer: Package Import Robot
  • Author(s): Florian Schlichting
  • Date: 2014-07-15 15:01:05 UTC
  • Revision ID: package-import@ubuntu.com-20140715150105-b15bondvgyduzfwd
Tags: 0.52+git20140102-2
http://bugs.debian.org/754839
http://bugs.debian.org/749411
* Add require-starttls.patch to ensure encrypted connections and prevent
  ssl-stripping attacks (closes: #754839). Thanks dkg for the patch!
* Fix conflicting declarations of set_ssl and ensure encryption when
  registering (closes: #749411)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/require-starttls.patch
 
1
Description: require TLS-on-connect or STARTTLS
 
2
 This patch disables unencrypted connections, which is in line with the
 
3
 XMPP manifesto of early 2014. As a side effect, it protects against
 
4
 SSL-stripping attacks (closes: #754839)
 
5
Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 
6
Forwarded: http://cybione.org/lists/irssi-xmpp-list/msg00714.html
 
7
 
 
8
--- a/src/core/xmpp-servers.c
 
9
+++ b/src/core/xmpp-servers.c
 
10
@@ -423,7 +423,7 @@
 
11
        ssl = lm_ssl_new(NULL, lm_ssl_cb, user_data, NULL);
 
12
        lm_connection_set_ssl(lmconn, ssl);
 
13
        if (use_starttls)
 
14
-               lm_ssl_use_starttls(ssl, TRUE, FALSE);
 
15
+               lm_ssl_use_starttls(ssl, TRUE, TRUE);
 
16
        lm_ssl_unref(ssl);
 
17
        return TRUE;
 
18
 }