Skip to content
Snippets Groups Projects
Commit 6a8737bc authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

do TLS handshake without blocking. Fixes #7250

parent 2bc9f743
No related branches found
No related tags found
No related merge requests found
...@@ -418,13 +418,13 @@ class NonBlockingTLS(PlugIn): ...@@ -418,13 +418,13 @@ class NonBlockingTLS(PlugIn):
tcpsock._send = wrapper.send tcpsock._send = wrapper.send
log.debug("Initiating handshake...") log.debug("Initiating handshake...")
tcpsock._sslObj.setblocking(True)
try: try:
tcpsock._sslObj.do_handshake() tcpsock._sslObj.do_handshake()
except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e:
pass
except: except:
log.error('Error while TLS handshake: ', exc_info=True) log.error('Error while TLS handshake: ', exc_info=True)
return False return False
tcpsock._sslObj.setblocking(False)
self._owner.ssl_lib = PYOPENSSL self._owner.ssl_lib = PYOPENSSL
return True return True
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment