From 9081b465ed0bbaab0eb0d95a9db3e8d7a6bdc122 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 24 Apr 2010 09:06:07 +0200
Subject: [PATCH] better var name.
---
src/common/xmpp/tls_nb.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 4cf2a5c211..d6797e2496 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -355,10 +355,9 @@ class NonBlockingTLS(PlugIn):
# If we are going to use a client cert/key pair for authentication,
# we choose 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)
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:
log.warning('Unable to load client pkcs12 certificate from '
'file %s: %s ... Is it a valid PKCS12 cert?' % \
--
GitLab