Changeset 9146

Timestamp:

12/15/07 09:31:42 (11 months ago)

Author:

asterix

Message:

[shprotx] fix loading of multiple SSL certificates and better error message. fixes #3619

Files:

• trunk/src/common/xmpp/transports_nb.py (modified) (2 diffs)

trunk/src/common/xmpp/transports_nb.py

@@ -762 +762 @@
                                 if 'BEGIN CERTIFICATE' in line:
                                         begin = i
-                                        continue
                                 elif 'END CERTIFICATE' in line and begin > -1:
                                         cert = ''.join(lines[begin:i+2])
@@ -769 +768 @@
                                                         OpenSSL.crypto.FILETYPE_PEM, cert)
                                                 store.add_cert(X509cert)
+                                        except OpenSSL.crypto.Error, exception_obj:
+                                                log.warning('Unable to load a certificate from file %s: %s' %\
+                                                        (gajim.MY_CACERTS, exception_obj.message[0][2]))
                                         except:
-                                                log.warning('Unable to load a certificate from file %s' % \
+                                                log.warning(
+                                                        'Unknown error while loading certificate from file %s' % \
                                                         gajim.MY_CACERTS)
                                         begin = -1