summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-30 17:15:13 -0700
committerLance Stout <lancestout@gmail.com>2012-09-30 17:15:13 -0700
commit44e7585bf8c7715eb0eaf348976b4c0fc0568722 (patch)
treed9c271b2013371e653d18d8ea4db13b17c670c7b
parenta2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3 (diff)
parent94488fa2ea4dac7ff6fce20621d2e80e700f6299 (diff)
downloadslixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.gz
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.bz2
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.tar.xz
slixmpp-44e7585bf8c7715eb0eaf348976b4c0fc0568722.zip
Merge branch 'master' into develop
-rw-r--r--sleekxmpp/xmlstream/cert.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/cert.py b/sleekxmpp/xmlstream/cert.py
index 6e877efc..fa12f794 100644
--- a/sleekxmpp/xmlstream/cert.py
+++ b/sleekxmpp/xmlstream/cert.py
@@ -94,7 +94,7 @@ def extract_names(raw_cert):
def extract_dates(raw_cert):
if not HAVE_PYASN1:
- log.warning("Could not find pyasn1 module. " + \
+ log.warning("Could not find pyasn1 and pyasn1_modules. " + \
"SSL certificate expiration COULD NOT BE VERIFIED.")
return None, None
@@ -130,7 +130,7 @@ def get_ttl(raw_cert):
def verify(expected, raw_cert):
if not HAVE_PYASN1:
- log.warning("Could not find pyasn1 module. " + \
+ log.warning("Could not find pyasn1 and pyasn1_modules. " + \
"SSL certificate COULD NOT BE VERIFIED.")
return