Merge branch 'master' into develop

crystalstorm · Jun 27, 2017 · cda33a4 · cda33a4
2 parents de98180 + db844e5
commit cda33a4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/w3af/plugins/audit/ssl_certificate.py b/w3af/plugins/audit/ssl_certificate.py
@@ -360,9 +360,12 @@ class CertificateError(Exception):
     pass
 
 
-def _dnsname_to_pat(dn):
+def _dnsname_to_pat(dn, max_wildcards=2):
     pats = []
     for frag in dn.split(r'.'):
+        if frag.count('*') > max_wildcards:
+            raise CertificateError("too many wildcards in certificate name: "
+                                   + repr(dn))
         if frag == '*':
             # When '*' is a fragment by itself, it matches a non-empty dotless
             # fragment.