catch wrap_socket timeouts

2017-08-26 06:52:43 +02:00 · 2017-08-26 06:52:43 +02:00 · 4df5997940
parent 0fd108079d
commit 4df5997940
1 changed files with 4 additions and 0 deletions
--- a/lib/interface.py
+++ b/lib/interface.py
@ -136,6 +136,8 @@ class TcpConnection(threading.Thread, util.PrintError):
                # try with CA first
                try:
                    s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1_1, cert_reqs=ssl.CERT_REQUIRED, ca_certs=ca_path, do_handshake_on_connect=True)
+                except socket.timeout:
+                    return
                except ssl.SSLError as e:
                    print_error(e)
                    s = None
@ -149,6 +151,8 @@ class TcpConnection(threading.Thread, util.PrintError):
                    return
                try:
                    s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1_1, cert_reqs=ssl.CERT_NONE, ca_certs=None)
+                except socket.timeout:
+                    return
                except ssl.SSLError as e:
                    self.print_error("SSL error retrieving SSL certificate:", e)
                    return