changeset 77d4c5bf1993 in /home/hg/repos/gajim

author: Fedor Brunner fedor.brunner@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,