From 3c2a220c65147ab374dedd0565fe9eac0a370392 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 23 Jan 2008 19:04:35 +0000 Subject: [PATCH] handle all PyopenSSL errors. fixes #3686 --- src/common/xmpp/transports_nb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py index 9fab511ca..64e5323d2 100644 --- a/src/common/xmpp/transports_nb.py +++ b/src/common/xmpp/transports_nb.py @@ -790,7 +790,8 @@ class NonBlockingTLS(PlugIn): try: self.starttls='in progress' tcpsock._sslObj.do_handshake() - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e: + # Errors are handeled in _do_receive function + except: pass tcpsock._sslObj.setblocking(False) log.debug("Synchronous handshake completed")