AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: catch py3 exceptions

Browse Source
This commit is contained in:
ThomasV
2017-10-25 17:43:30 +02:00
parent 06f18f9078
commit 1cbc794229
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/interface.py
View File

@@ -135,11 +135,12 @@ class TcpConnection(threading.Thread, util.PrintError):
# try with CA first # try with CA first
try: 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) 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: except ssl.SSLError as e:
print_error(e) print_error(e)
s = None s = None
except:
return
if s and self.check_host_name(s.getpeercert(), self.host): if s and self.check_host_name(s.getpeercert(), self.host):
self.print_error("SSL certificate signed by CA") self.print_error("SSL certificate signed by CA")
return s return s
@@ -150,11 +151,11 @@ class TcpConnection(threading.Thread, util.PrintError):
return return
try: try:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1_1, cert_reqs=ssl.CERT_NONE, ca_certs=None) 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: except ssl.SSLError as e:
self.print_error("SSL error retrieving SSL certificate:", e) self.print_error("SSL error retrieving SSL certificate:", e)
return return
except:
return
dercert = s.getpeercert(True) dercert = s.getpeercert(True)
s.close() s.close()