Remove unneeded ssl_support checks.

sleekxmpp/features/feature_starttls/starttls.py

@@ -54,13 +54,9 @@ class FeatureSTARTTLS(BasePlugin):
             return False
         elif not self.xmpp.use_tls:
             return False
-        elif self.xmpp.ssl_support:
+        else:
             self.xmpp.send(features['starttls'], now=True)
             return True
-        else:
-            log.warning("The module tlslite is required to log in" + \
-                        " to some servers, and has not been found.")
-            return False
 
     def _handle_starttls_proceed(self, proceed):
         """Restart the XML stream when TLS is accepted."""

sleekxmpp/xmlstream/xmlstream.py

@@ -58,9 +58,6 @@ WAIT_TIMEOUT = 0.1
 #: a GIL increasing this value can provide better performance.
 HANDLER_THREADS = 1
 
-#: Flag indicating if the SSL library is available for use.
-SSL_SUPPORT = True
-
 #: The time in seconds to delay between attempts to resend data
 #: after an SSL error.
 SSL_RETRY_DELAY = 0.5
@@ -117,9 +114,6 @@ class XMLStream(object):
     """
 
     def __init__(self, socket=None, host='', port=0):
-        #: Flag indicating if the SSL library is available for use.
-        self.ssl_support = SSL_SUPPORT
-
         #: Most XMPP servers support TLSv1, but OpenFire in particular
         #: does not work well with it. For OpenFire, set
         #: :attr:`ssl_version` to use ``SSLv23``::
@@ -506,7 +500,7 @@ class XMLStream(object):
                     self.reconnect_delay = delay
                 return False
 
-        if self.use_ssl and self.ssl_support:
+        if self.use_ssl:
             log.debug("Socket Wrapped for SSL")
             if self.ca_certs is None:
                 cert_policy = ssl.CERT_NONE
@@ -535,7 +529,7 @@ class XMLStream(object):
                 log.debug("Connecting to %s:%s", domain, self.address[1])
                 self.socket.connect(self.address)
 
-                if self.use_ssl and self.ssl_support:
+                if self.use_ssl:
                     try:
                         self.socket.do_handshake()
                     except (Socket.error, ssl.SSLError):
@@ -823,7 +817,6 @@ class XMLStream(object):
         If the handshake is successful, the XML stream will need
         to be restarted.
         """
-        if self.ssl_support:
         log.info("Negotiating TLS")
         log.info("Using SSL version: %s", str(self.ssl_version))
         if self.ca_certs is None:
@@ -853,6 +846,7 @@ class XMLStream(object):
             if not self.event_handled('ssl_invalid_chain'):
                 self.disconnect(self.auto_reconnect, send_close=False)
             else:
+                self._der_cert = self.socket.getpeercert(binary_form=True)
                 self.event('ssl_invalid_chain', direct=True)
             return False
 
@@ -872,9 +866,6 @@ class XMLStream(object):
 
         self.set_socket(self.socket)
         return True
-        else:
-            log.warning("Tried to enable TLS, but ssl module not found.")
-            return False
 
     def _cert_expiration(self, event):
         """Schedule an event for when the TLS certificate expires."""