changeset f9e1827b7d59 in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f9e1827b7d59 description: don't crash when cacerts is an empty string
diffstat:
nbxmpp/tls_nb.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
diffs (19 lines):
diff -r 919506ffd27e -r f9e1827b7d59 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Wed Jan 02 13:51:30 2013 +0100 +++ b/nbxmpp/tls_nb.py Sun Feb 10 11:28:44 2013 +0100 @@ -395,13 +395,9 @@
tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, - self._ssl_verify_callback) - try: - tcpsock._sslContext.load_verify_locations(self.cacerts) - except: - log.warning('Unable to load SSL certificates from file %s' % \ - os.path.abspath(self.cacerts)) + self._ssl_verify_callback) store = tcpsock._sslContext.get_cert_store() + self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) if os.path.isdir('/etc/ssl/certs'): for f in os.listdir('/etc/ssl/certs'):