##// END OF EJS Templates
sslutil: fix some edge cases in Python 3 support...
Augie Fackler -
r37889:51a2f8d1 default
parent child Browse files
Show More
@@ -640,9 +640,9 b' def _verifycert(cert, hostname):'
640 return _('no certificate received')
640 return _('no certificate received')
641
641
642 dnsnames = []
642 dnsnames = []
643 san = cert.get('subjectAltName', [])
643 san = cert.get(r'subjectAltName', [])
644 for key, value in san:
644 for key, value in san:
645 if key == 'DNS':
645 if key == r'DNS':
646 try:
646 try:
647 if _dnsnamematch(value, hostname):
647 if _dnsnamematch(value, hostname):
648 return
648 return
@@ -672,6 +672,7 b' def _verifycert(cert, hostname):'
672
672
673 dnsnames.append(value)
673 dnsnames.append(value)
674
674
675 dnsnames = [pycompat.bytesurl(d) for d in dnsnames]
675 if len(dnsnames) > 1:
676 if len(dnsnames) > 1:
676 return _('certificate is for %s') % ', '.join(dnsnames)
677 return _('certificate is for %s') % ', '.join(dnsnames)
677 elif len(dnsnames) == 1:
678 elif len(dnsnames) == 1:
General Comments 0
You need to be logged in to leave comments. Login now