Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/python-nbxmpp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Brunner <fedor.brunner@azet.sk>2014-01-21 03:15:25 +0400
committerFedor Brunner <fedor.brunner@azet.sk>2014-01-21 03:15:25 +0400
commitb84b024db4f23fd71d5891500bb2ce9f3dc8aecf (patch)
tree76a0c85ceb35a4f6a7fd5c5a57ff8d3fbb71fe20
parente2528bf46c567890dd753ff5c665a680ca2e1e60 (diff)
Don't overwrite self._owner.ssl_errnum with incorrect value. Fixes #15
-rw-r--r--nbxmpp/tls_nb.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nbxmpp/tls_nb.py b/nbxmpp/tls_nb.py
index 85a1859..9222afc 100644
--- a/nbxmpp/tls_nb.py
+++ b/nbxmpp/tls_nb.py
@@ -398,7 +398,7 @@ class NonBlockingTLS(PlugIn):
else:
log.info('client cert and key loaded OK')
- tcpsock.ssl_errnum = []
+ tcpsock.ssl_errnum = 0
tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,
self._ssl_verify_callback)
tcpsock._sslContext.set_cipher_list(self.cipher_list)
@@ -461,7 +461,7 @@ class NonBlockingTLS(PlugIn):
def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok):
# Exceptions can't propagate up through this callback, so print them here.
try:
- if depth == 0:
+ if not ok and depth == 0:
self._owner.ssl_certificate = cert
self._owner.ssl_errnum = errnum
return True