Don't break checking certs for localhost.

This commit is contained in:
Lance Stout 2012-09-13 11:00:29 -07:00
parent cf28d4586d
commit fb3e6b7e35

View File

@ -147,7 +147,10 @@ def verify(expected, raw_cert):
raise CertificateError( raise CertificateError(
'Certificate has expired.') 'Certificate has expired.')
if '.' in expected:
expected_wild = expected[expected.index('.'):] expected_wild = expected[expected.index('.'):]
else:
expected_wild = expected
expected_srv = '_xmpp-client.%s' % expected expected_srv = '_xmpp-client.%s' % expected
for name in cert_names['XMPPAddr']: for name in cert_names['XMPPAddr']:
@ -160,7 +163,10 @@ def verify(expected, raw_cert):
if name == expected: if name == expected:
return True return True
if name.startswith('*'): if name.startswith('*'):
if '.' in name:
name_wild = name[name.index('.'):] name_wild = name[name.index('.'):]
else:
name_wild = name
if expected_wild == name_wild: if expected_wild == name_wild:
return True return True
for name in cert_names['URI']: for name in cert_names['URI']: