jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'samwhited/sslsocket_workaround'

Browse Source
This commit is contained in:
louiz’ 2017-05-16 17:24:46 +02:00
commit d7ffcb54eb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slixmpp/xmlstream/xmlstream.py
View File

@ -525,7 +525,9 @@ class XMLStream(asyncio.BaseProtocol):
else: else:
self.event('ssl_invalid_chain', e) self.event('ssl_invalid_chain', e)
else: else:
der_cert = transp.get_extra_info("socket").getpeercert(True) # Workaround for a regression in 3.4 where ssl_object was not set.
der_cert = transp.get_extra_info("ssl_object",
default=transp.get_extra_info("socket")).getpeercert(True)
pem_cert = ssl.DER_cert_to_PEM_cert(der_cert) pem_cert = ssl.DER_cert_to_PEM_cert(der_cert)
self.event('ssl_cert', pem_cert) self.event('ssl_cert', pem_cert)