diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2011-07-27 00:44:11 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2011-07-27 00:44:11 +0400 |
| commit | 94644a2ee3e3d2ec3926a90859a57287c49a1c96 (patch) | |
| tree | 0ab8c2e5672f4225337543fd02508c4723dee92e /src/common/xmpp | |
| parent | 8d6172469c8fb61d4e3e51207707e667f622665b (diff) | |
ability to connect to a host that require a PCKS certificate that is encrypted.
Diffstat (limited to 'src/common/xmpp')
| -rw-r--r-- | src/common/xmpp/tls_nb.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py index 7a9c80f98..cc8393d52 100644 --- a/src/common/xmpp/tls_nb.py +++ b/src/common/xmpp/tls_nb.py @@ -359,7 +359,8 @@ class NonBlockingTLS(PlugIn): tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) log.debug('Using client cert and key from %s' % conn.client_cert) try: - p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read()) + p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), + conn.client_cert_passphrase) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load client pkcs12 certificate from ' 'file %s: %s ... Is it a valid PKCS12 cert?' % \ |