copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

load certificates from /etc/ssl/certs too. Fixes #4633

This commit is contained in:
Yann Leboulanger 2009-01-15 17:54:28 +00:00
parent 7361129770
commit 77b5c85f18
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/xmpp/tls_nb.py
View File

@ -299,7 +299,7 @@ class NonBlockingTLS(PlugIn):
else: else:
return False return False
def _load_user_certs(self, cert_path, cert_store): def _load_cert_file(self, cert_path, cert_store, logg=True):
if not os.path.isfile(cert_path): if not os.path.isfile(cert_path):
return return
f = open(cert_path) f = open(cert_path)
@ -316,11 +316,12 @@ class NonBlockingTLS(PlugIn):
OpenSSL.crypto.FILETYPE_PEM, cert) OpenSSL.crypto.FILETYPE_PEM, cert)
cert_store.add_cert(x509cert) cert_store.add_cert(x509cert)
except OpenSSL.crypto.Error, exception_obj: except OpenSSL.crypto.Error, exception_obj:
if logg:
log.warning('Unable to load a certificate from file %s: %s' %\ log.warning('Unable to load a certificate from file %s: %s' %\
(self.mycerts, exception_obj.args[0][0][2])) (cert_path, exception_obj.args[0][0][2]))
except: except:
log.warning('Unknown error while loading certificate from file%s' log.warning('Unknown error while loading certificate from file '
% self.mycerts) '%s' % cert_path)
begin = -1 begin = -1
i += 1 i += 1
@ -337,7 +338,14 @@ class NonBlockingTLS(PlugIn):
except: except:
log.warning('Unable to load SSL certificates from file %s' % \ log.warning('Unable to load SSL certificates from file %s' % \
os.path.abspath(self.cacerts)) os.path.abspath(self.cacerts))
self._load_user_certs(self.mycerts, tcpsock._sslContext.get_cert_store()) store = tcpsock._sslContext.get_cert_store()
self._load_cert_file(self.mycerts, store)
if os.path.isdir('/etc/ssl/certs'):
for f in os.listdir('/etc/ssl/certs'):
# We don't logg because there is a lot a duplicated certs in this
# folder
self._load_cert_file(os.path.join('/etc/ssl/certs', f), store,
logg=False)
tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext,
tcpsock._sock) tcpsock._sock)