|
@@ -98,14 +98,12 @@ class ServerSSLCertVerification(object):
|
|
'certificate against')
|
|
'certificate against')
|
|
return False
|
|
return False
|
|
|
|
|
|
- acceptableCNs = [pfx + self.hostname
|
|
|
|
- for pfx in self.serverCNPrefixes]
|
|
|
|
- if peerCertSubj.commonName in acceptableCNs:
|
|
|
|
|
|
+ if peerCertSubj.commonName == self.hostname:
|
|
return preverifyOK
|
|
return preverifyOK
|
|
else:
|
|
else:
|
|
log.error('Peer certificate CN %r doesn\'t match the '
|
|
log.error('Peer certificate CN %r doesn\'t match the '
|
|
'expected CN %r', peerCertSubj.commonName,
|
|
'expected CN %r', peerCertSubj.commonName,
|
|
- acceptableCNs)
|
|
|
|
|
|
+ self.hostname)
|
|
return False
|
|
return False
|
|
else:
|
|
else:
|
|
if peerCertDN == self.certDN:
|
|
if peerCertDN == self.certDN:
|