python-nbxmpp: do TLS handshake without blocking. - Commits

29 Nov 2012

changeset b599a742986d in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b599a742986d
description: do TLS handshake without blocking.
diffstat:
nbxmpp/tls_nb.py |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diffs (19 lines):
diff -r b866926c8c53 -r b599a742986d nbxmpp/tls_nb.py

--- a/nbxmpp/tls_nb.py	Thu Nov 29 14:56:33 2012 +0100
+++ b/nbxmpp/tls_nb.py	Thu Nov 29 14:58:25 2012 +0100
@@ -418,13 +418,13 @@
         tcpsock._send = wrapper.send
log.debug("Initiating handshake...")
-        tcpsock._sslObj.setblocking(True)
         try:
             tcpsock._sslObj.do_handshake()
+        except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e:
+            pass
         except:
             log.error('Error while TLS handshake: ', exc_info=True)
             return False
-        tcpsock._sslObj.setblocking(False)
         self._owner.ssl_lib = PYOPENSSL
         return True

    