Commits

commits@gajim.org

17632 discussions

python-nbxmpp: Ubuntu 12.04.4 package python-openssl (0.12-1ubun...
by Fedor Brunner 29 Jan '14

29 Jan '14

changeset cadd7701fcfe in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=cadd7701fcfe description: Ubuntu 12.04.4 package python-openssl (0.12-1ubuntu2.1) is based on an older version of pyOpenSSL. In this version of pyOpenSSL OpenSSL.SSL.OPENSSL_VERSION_NUMBER is not defined. Fixes: #18 diffstat: nbxmpp/tls_nb.py | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diffs (36 lines): diff -r 4c3da64e4d92 -r cadd7701fcfe nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Mon Jan 27 20:18:13 2014 +0100 +++ b/nbxmpp/tls_nb.py Wed Jan 29 16:47:10 2014 +0100 @@ -369,17 +369,21 @@ # py-OpenSSL < 0.9 or old OpenSSL flags |= 16384 - # OpenSSL 1.0.1d supports TLS 1.1 and TLS 1.2 and - # fixes renegotiation in TLS 1.1, 1.2 by using the correct TLS version. - if OpenSSL.SSL.OPENSSL_VERSION_NUMBER >= 0x1000104f: - if self.tls_version != '1.0': - flags |= OpenSSL.SSL.OP_NO_TLSv1 - if self.tls_version not in ('1.0', '1.1'): - try: - flags |= OpenSSL.SSL.OP_NO_TLSv1_1 - except AttributeError, e: - # older py-OpenSSL - flags |= 0x10000000 + try: + # OpenSSL 1.0.1d supports TLS 1.1 and TLS 1.2 and + # fixes renegotiation in TLS 1.1, 1.2 by using the correct TLS version. + if OpenSSL.SSL.OPENSSL_VERSION_NUMBER >= 0x1000104f: + if self.tls_version != '1.0': + flags |= OpenSSL.SSL.OP_NO_TLSv1 + if self.tls_version not in ('1.0', '1.1'): + try: + flags |= OpenSSL.SSL.OP_NO_TLSv1_1 + except AttributeError, e: + # older py-OpenSSL + flags |= 0x10000000 + except AttributeError, e: + pass # much older py-OpenSSL + tcpsock._sslContext.set_options(flags)

1 0

gajim: Backed out changeset c1f88dc9e4d0 of backed out changeset...
by Gajim 29 Jan '14

29 Jan '14

changeset 77d4c5bf1993 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=77d4c5bf1993 description: Backed out changeset c1f88dc9e4d0 of backed out changeset 4ba5c2f6386e diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (27 lines): diff -r c1f88dc9e4d0 -r 77d4c5bf1993 src/common/config.py --- a/src/common/config.py Wed Jan 29 14:42:14 2014 +0100 +++ b/src/common/config.py Wed Jan 29 16:22:17 2014 +0100 @@ -349,6 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], diff -r c1f88dc9e4d0 -r 77d4c5bf1993 src/common/connection.py --- a/src/common/connection.py Wed Jan 29 14:42:14 2014 +0100 +++ b/src/common/connection.py Wed Jan 29 16:22:17 2014 +0100 @@ -1239,9 +1239,11 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS + tls_version = gajim.config.get_per('accounts', self.name, + 'tls_version') cipher_list = gajim.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

gajim: Backed out changeset 4ba5c2f6386e
by Gajim 29 Jan '14

29 Jan '14

changeset c1f88dc9e4d0 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c1f88dc9e4d0 description: Backed out changeset 4ba5c2f6386e I have submitted the 'tls_version' to the incorrect default branch. The correct submit was done in changeset 15331:b5831b64e5d2 , branch gajim_0.16 . diffstat: src/common/config.py | 1 - src/common/connection.py | 4 +--- 2 files changed, 1 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 4ba5c2f6386e -r c1f88dc9e4d0 src/common/config.py --- a/src/common/config.py Mon Jan 27 16:31:08 2014 +0100 +++ b/src/common/config.py Wed Jan 29 14:42:14 2014 +0100 @@ -349,7 +349,6 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], - 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], diff -r 4ba5c2f6386e -r c1f88dc9e4d0 src/common/connection.py --- a/src/common/connection.py Mon Jan 27 16:31:08 2014 +0100 +++ b/src/common/connection.py Wed Jan 29 14:42:14 2014 +0100 @@ -1239,11 +1239,9 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS - tls_version = gajim.config.get_per('accounts', self.name, - 'tls_version') cipher_list = gajim.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) + secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

gajim: Disable TLS tickets (RFC 5077) in OpenSSL Context for XTLS.
by Gajim 29 Jan '14

29 Jan '14

changeset 1e160dfa3c32 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1e160dfa3c32 description: Disable TLS tickets (RFC 5077) in OpenSSL Context for XTLS. More on the effect of TLS tickets: https://media.blackhat.com/us-13/US-13-Daigniere-TLS-Secrets-Slides.pdf Fixes #7638 diffstat: src/common/jingle_xtls.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 8d9c23ae110c -r 1e160dfa3c32 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Jan 27 20:18:42 2014 +0100 +++ b/src/common/jingle_xtls.py Wed Jan 29 14:12:10 2014 +0100 @@ -99,7 +99,8 @@ constructs and returns the context objects """ ctx = SSL.Context(SSL.SSLv23_METHOD) - flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE) + flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE \ + | SSL.OP_NO_TICKET) ctx.set_options(flags) ctx.set_cipher_list('HIGH:!aNULL:!3DES')

1 0

gajim: Add ability to configure TLS protocol version.
by Gajim 27 Jan '14

27 Jan '14

changeset 4ba5c2f6386e in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4ba5c2f6386e description: Add ability to configure TLS protocol version. add configuration option tls_version Related to https://python-nbxmpp.gajim.org/ticket/17 diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (27 lines): diff -r d55c0a3e26b1 -r 4ba5c2f6386e src/common/config.py --- a/src/common/config.py Mon Dec 23 23:26:54 2013 +0100 +++ b/src/common/config.py Mon Jan 27 16:31:08 2014 +0100 @@ -349,6 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], diff -r d55c0a3e26b1 -r 4ba5c2f6386e src/common/connection.py --- a/src/common/connection.py Mon Dec 23 23:26:54 2013 +0100 +++ b/src/common/connection.py Mon Jan 27 16:31:08 2014 +0100 @@ -1239,9 +1239,11 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS + tls_version = gajim.config.get_per('accounts', self.name, + 'tls_version') cipher_list = gajim.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

gajim: require nbxmpp 0.3.1
by Gajim 27 Jan '14

27 Jan '14

changeset 8d9c23ae110c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8d9c23ae110c description: require nbxmpp 0.3.1 diffstat: src/gajim.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (18 lines): diff -r b5831b64e5d2 -r 8d9c23ae110c src/gajim.py --- a/src/gajim.py Mon Jan 27 16:31:08 2014 +0100 +++ b/src/gajim.py Mon Jan 27 20:18:42 2014 +0100 @@ -70,11 +70,11 @@ try: from distutils.version import LooseVersion as V - if V(nbxmpp.__version__) < V("0.3"): - print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + if V(nbxmpp.__version__) < V("0.3.1"): + print 'Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...' sys.exit() except: - print 'Gajim needs python-nbxmpp > 0.3 to run. Quiting...' + print 'Gajim needs python-nbxmpp > 0.3.1 to run. Quiting...' sys.exit() from common import demandimport

1 0

python-nbxmpp: update version number
by Yann Leboulanger 27 Jan '14

27 Jan '14

changeset 4c3da64e4d92 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=4c3da64e4d92 description: update version number diffstat: nbxmpp/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r b07c9fdb13dc -r 4c3da64e4d92 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Mon Jan 27 16:28:32 2014 +0100 +++ b/nbxmpp/__init__.py Mon Jan 27 20:18:13 2014 +0100 @@ -17,4 +17,4 @@ from plugin import PlugIn from smacks import Smacks -__version__ = "0.3" +__version__ = "0.3.1"

1 0

gajim: Add ability to configure TLS protocol version.
by Gajim 27 Jan '14

27 Jan '14

changeset b5831b64e5d2 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b5831b64e5d2 description: Add ability to configure TLS protocol version. add configuration option tls_version Related to https://python-nbxmpp.gajim.org/ticket/17 diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (27 lines): diff -r 83e9630fc543 -r b5831b64e5d2 src/common/config.py --- a/src/common/config.py Sun Jan 26 19:36:23 2014 +0100 +++ b/src/common/config.py Mon Jan 27 16:31:08 2014 +0100 @@ -349,6 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], diff -r 83e9630fc543 -r b5831b64e5d2 src/common/connection.py --- a/src/common/connection.py Sun Jan 26 19:36:23 2014 +0100 +++ b/src/common/connection.py Mon Jan 27 16:31:08 2014 +0100 @@ -1253,9 +1253,11 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS + tls_version = gajim.config.get_per('accounts', self.name, + 'tls_version') cipher_list = gajim.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) + secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

gajim: include HTMLParser module in windows build for OTR plugin
by Gajim 26 Jan '14

26 Jan '14

changeset 83e9630fc543 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=83e9630fc543 description: include HTMLParser module in windows build for OTR plugin diffstat: setup_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3bb56ed3cd4f -r 83e9630fc543 setup_win32.py --- a/setup_win32.py Sun Jan 26 08:59:24 2014 +0100 +++ b/setup_win32.py Sun Jan 26 19:36:23 2014 +0100 @@ -33,7 +33,7 @@ 'build_exe': { 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers', 'win32com.client', 'win32com.server'], + 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

gajim: make search button insensitive before we get the search f...
by Gajim 26 Jan '14

26 Jan '14

changeset 3bb56ed3cd4f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3bb56ed3cd4f description: make search button insensitive before we get the search form. Fixes #7631 diffstat: src/search_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 1eb640e52ded -r 3bb56ed3cd4f src/search_window.py --- a/src/search_window.py Thu Jan 23 22:59:47 2014 +0100 +++ b/src/search_window.py Sun Jan 26 08:59:24 2014 +0100 @@ -48,6 +48,8 @@ 'add_contact_button', 'information_button'): self.__dict__[name] = self.xml.get_object(name) + self.search_button.set_sensitive(False) + # displaying the window self.xml.connect_signals(self) self.window.show_all() @@ -152,6 +154,7 @@ self.data_form_widget.show_all() self.search_vbox.pack_start(self.data_form_widget) + self.search_button.set_sensitive(True) def on_result_treeview_cursor_changed(self, treeview): if self.jid_column == -1:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits