changeset d34a996f87b8 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d34a996f87b8
description: store all SSL errors
diffstat:
src/common/xmpp/tls_nb.py | 12 ++++++------
src/common/xmpp/transports_nb.py | 6 ++++++
2 files changed, 12 insertions(+), 6 deletions(-)
diffs (45 lines):
diff -r 385f8a1fad66 -r d34a996f87b8 src/common/xmpp/tls_nb.py
--- a/src/common/xmpp/tls_nb.py Wed Feb 13 16:10:44 2013 +0100
+++ b/src/common/xmpp/tls_nb.py Wed Feb 13 16:12:41 2013 +0100
@@ -393,7 +393,7 @@
flags |= 16384
tcpsock._sslContext.set_options(flags)
- tcpsock.ssl_errnum = 0
+ tcpsock.ssl_errnum = [0]
tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,
self._ssl_verify_callback)
try:
@@ -449,11 +449,11 @@
def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok):
# Exceptions can't propagate up through this callback, so print them
here.
try:
- self._owner.ssl_fingerprint_sha1 = cert.digest('sha1')
- self._owner.ssl_certificate = cert
- self._owner.ssl_errnum = errnum
- self._owner.ssl_cert_pem = OpenSSL.crypto.dump_certificate(
- OpenSSL.crypto.FILETYPE_PEM, cert)
+ self._owner.ssl_fingerprint_sha1.ppend(cert.digest('sha1'))
+ self._owner.ssl_certificate.append(cert)
+ self._owner.ssl_errnum.append(errnum)
+ self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate(
+ OpenSSL.crypto.FILETYPE_PEM, cert))
return True
except:
log.error("Exception caught in _ssl_info_callback:", exc_info=True)
diff -r 385f8a1fad66 -r d34a996f87b8 src/common/xmpp/transports_nb.py
--- a/src/common/xmpp/transports_nb.py Wed Feb 13 16:10:44 2013 +0100
+++ b/src/common/xmpp/transports_nb.py Wed Feb 13 16:12:41 2013 +0100
@@ -311,6 +311,12 @@
self.proxy_dict = proxy_dict
self.on_remote_disconnect = self.disconnect
+ # ssl variables
+ self.ssl_fingerprint_sha1 = []
+ self.ssl_certificate = []
+ self.ssl_errnum = []
+ self.ssl_cert_pem = []
+
# FIXME: transport should not be aware xmpp
def start_disconnect(self):
NonBlockingTransport.start_disconnect(self)
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
