jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-09-30 17:15:13 -07:00
commit 44e7585bf8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleekxmpp/xmlstream/cert.py
View File

@ -94,7 +94,7 @@ def extract_names(raw_cert):
def extract_dates(raw_cert): def extract_dates(raw_cert):
if not HAVE_PYASN1: 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.") "SSL certificate expiration COULD NOT BE VERIFIED.")
return None, None return None, None
@ -130,7 +130,7 @@ def get_ttl(raw_cert):
def verify(expected, raw_cert): def verify(expected, raw_cert):
if not HAVE_PYASN1: 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.") "SSL certificate COULD NOT BE VERIFIED.")
return return