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

better var name.

This commit is contained in:
Yann Leboulanger 2010-04-24 09:06:07 +02:00
parent 378096f797
commit 9081b465ed
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,10 +355,9 @@ class NonBlockingTLS(PlugIn):
# If we are going to use a client cert/key pair for authentication, # If we are going to use a client cert/key pair for authentication,
# we choose TLSv1 method. # we choose TLSv1 method.
tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
client_cert_path = self._owner._owner._caller.client_cert
log.debug('Using client cert and key from %s' % conn.client_cert) log.debug('Using client cert and key from %s' % conn.client_cert)
try: try:
p12 = OpenSSL.crypto.load_pkcs12(open(client_cert_path).read()) p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read())
except OpenSSL.crypto.Error, exception_obj: except OpenSSL.crypto.Error, exception_obj:
log.warning('Unable to load client pkcs12 certificate from ' log.warning('Unable to load client pkcs12 certificate from '
'file %s: %s ... Is it a valid PKCS12 cert?' % \ 'file %s: %s ... Is it a valid PKCS12 cert?' % \