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

Fix SSL handshake handling when not using legacy SSL.

Browse Source 
Fixes issue #172
This commit is contained in:
Lance Stout 2012-06-09 10:32:25 -07:00
parent 48dd01b0bb
commit 0953896d2d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleekxmpp/xmlstream/xmlstream.py
View File

@ -511,9 +511,10 @@ class XMLStream(object):
log.debug("Connecting to %s:%s", domain, self.address[1]) log.debug("Connecting to %s:%s", domain, self.address[1])
self.socket.connect(self.address) self.socket.connect(self.address)
if self.use_ssl and self.ssl_support:
try: try:
self.socket.do_handshake() self.socket.do_handshake()
except: except (Socket.error, ssl.SSLError):
log.error('CERT: Invalid certificate trust chain.') log.error('CERT: Invalid certificate trust chain.')
if not self.event_handled('ssl_invalid_chain'): if not self.event_handled('ssl_invalid_chain'):
self.disconnect(self.auto_reconnect, send_close=False) self.disconnect(self.auto_reconnect, send_close=False)
@ -521,8 +522,6 @@ class XMLStream(object):
self.event('ssl_invalid_chain', direct=True) self.event('ssl_invalid_chain', direct=True)
return False return False
if self.use_ssl and self.ssl_support:
self._der_cert = self.socket.getpeercert(binary_form=True) self._der_cert = self.socket.getpeercert(binary_form=True)
pem_cert = ssl.DER_cert_to_PEM_cert(self._der_cert) pem_cert = ssl.DER_cert_to_PEM_cert(self._der_cert)
log.debug('CERT: %s', pem_cert) log.debug('CERT: %s', pem_cert)
@ -802,7 +801,7 @@ class XMLStream(object):
try: try:
self.socket.do_handshake() self.socket.do_handshake()
except: except (Socket.error, ssl.SSLError):
log.error('CERT: Invalid certificate trust chain.') log.error('CERT: Invalid certificate trust chain.')
if not self.event_handled('ssl_invalid_chain'): if not self.event_handled('ssl_invalid_chain'):
self.disconnect(self.auto_reconnect, send_close=False) self.disconnect(self.auto_reconnect, send_close=False)