changeset 2608f3432ad1 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2608f3432ad1 description: hardcode the value of OpenSSL.SSL.OP_NO_TICKET for old version of openssl. Fixes #5689

diffstat:

src/common/xmpp/tls_nb.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 259d5bcfde43 -r 2608f3432ad1 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Dec 06 23:33:42 2010 +0100 +++ b/src/common/xmpp/tls_nb.py Tue Jan 25 11:54:28 2011 +0100 @@ -384,8 +384,13 @@ else: # See http://docs.python.org/dev/library/ssl.html tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - tcpsock._sslContext.set_options(OpenSSL.SSL.OP_NO_SSLv2 | \ - OpenSSL.SSL.OP_NO_TICKET) + flags = OpenSSL.SSL.OP_NO_SSLv2 + try: + flags |= OpenSSL.SSL.OP_NO_TICKET + except AttributeError, e: + # py-OpenSSL < 0.9 or old OpenSSL + flags |= 16384 + tcpsock._sslContext.set_options(flags)

tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,