changeset e719023831fb in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e719023831fb
description: check that pyopenssl > 0.12 is installed before using fonctions
available after this version
diffstat:
src/common/check_X509.py | 4 ++++
src/features_window.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r 69950c9bc900 -r e719023831fb src/common/check_X509.py
--- a/src/common/check_X509.py Tue Jan 03 20:17:33 2012 +0100
+++ b/src/common/check_X509.py Wed Jan 04 11:38:09 2012 +0100
@@ -4,6 +4,10 @@
try:
import OpenSSL.SSL
import OpenSSL.crypto
+ ver = OpenSSL.__version__
+ ver_l = [int(i) for i in ver.split('.')]
+ if ver_l < [0, 12]:
+ raise ImportError
from pyasn1.type import univ, constraint, char, namedtype, tag
from pyasn1.codec.der.decoder import decode
from common.helpers import prep, InvalidFormat
diff -r 69950c9bc900 -r e719023831fb src/features_window.py
--- a/src/features_window.py Tue Jan 03 20:17:33 2012 +0100
+++ b/src/features_window.py Wed Jan 04 11:38:09 2012 +0100
@@ -49,8 +49,8 @@
self.features = {
_('SSL certificate validation'): (self.pyopenssl_available,
_('A library used to validate server certificates to ensure a
secure connection.'),
- _('Requires python-pyopenssl.'),
- _('Requires python-pyopenssl.')),
+ _('Requires python-pyopenssl > 0.12 and pyasn1.'),
+ _('Requires python-pyopenssl > 0.12 and pyasn1.')),
_('Bonjour / Zeroconf'): (self.zeroconf_available,
_('Serverless chatting with autodetected clients in a local
network.'),
_('Requires python-avahi.'),
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
