AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: follow-up 6ec1578a90

Browse Source
This commit is contained in:
SomberNight
2019-05-22 17:43:33 +02:00
parent db9a9bbf25
commit a591ccf9b1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/interface.py
View File

@@ -305,7 +305,7 @@ class Interface(Logger):
if not self._is_saved_ssl_cert_available(): if not self._is_saved_ssl_cert_available():
try: try:
await self._try_saving_ssl_cert_for_first_time(ca_sslc) await self._try_saving_ssl_cert_for_first_time(ca_sslc)
except (OSError, aiorpcx.socks.SOCKSError) as e: except (OSError, ConnectError, aiorpcx.socks.SOCKSError) as e:
raise ErrorGettingSSLCertFromServer(e) from e raise ErrorGettingSSLCertFromServer(e) from e
# now we have a file saved in our certificate store # now we have a file saved in our certificate store
siz = os.stat(self.cert_path).st_size siz = os.stat(self.cert_path).st_size
@@ -389,9 +389,9 @@ class Interface(Logger):
async def get_certificate(self): async def get_certificate(self):
sslc = ssl.SSLContext() sslc = ssl.SSLContext()
try: try:
async with aiorpcx.Connector(RPCSession, async with _Connector(RPCSession,
host=self.host, port=self.port, host=self.host, port=self.port,
ssl=sslc, proxy=self.proxy) as session: ssl=sslc, proxy=self.proxy) as session:
return session.transport._ssl_protocol._sslpipe._sslobj.getpeercert(True) return session.transport._ssl_protocol._sslpipe._sslobj.getpeercert(True)
except ValueError: except ValueError:
return None return None