From 4df599794046f4aee7438ac7e5368de470a4de0f Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sat, 26 Aug 2017 06:52:43 +0200 Subject: [PATCH] catch wrap_socket timeouts --- lib/interface.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/interface.py b/lib/interface.py index 954017fd..a576442b 100644 --- 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