archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8311546: Certificate name constraints improperly validated with leading period

Browse source 
Reviewed-by: mullan
This commit is contained in:
Ben Perez 2023-11-01 16:49:50 +00:00 • committed by Sean Mullan
parent d354141aa1
commit bfaf5704e7
8 changed files with 303 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/sun/security/x509/DNSName.java
View file

@ -200,18 +200,12 @@ public class DNSName implements GeneralNameInterface {
* </ul>. These results are used in checking NameConstraints during
* certification path verification.
* <p>
* RFC5280: DNS name restrictions are expressed as host.example.com.
* RFC5280: For DNS names, restrictions MUST use the DNSName syntax in Section 4.2.1.6.
* Any DNS name that can be constructed by simply adding zero or more
* labels to the left-hand side of the name satisfies the name constraint.
* For example, www.host.example.com would satisfy the constraint but
* host1.example.com would not.
* <p>
* RFC 5280: DNSName restrictions are expressed as foo.bar.com.
* Any DNSName that
* can be constructed by simply adding to the left-hand side of the name
* satisfies the name constraint. For example, www.foo.bar.com would
* satisfy the constraint but foo1.bar.com would not.
* <p>
* RFC1034: By convention, domain names can be stored with arbitrary case, but
* domain name comparisons for all present domain functions are done in a
* case-insensitive manner, assuming an ASCII character set, and a high
@ -236,13 +230,13 @@ public class DNSName implements GeneralNameInterface {
constraintType = NAME_MATCH;
else if (thisName.endsWith(inName)) {
int inNdx = thisName.lastIndexOf(inName);
if (thisName.charAt(inNdx-1) == '.' )
if (thisName.charAt(inNdx-1) == '.' ^ inName.charAt(0) == '.')
constraintType = NAME_WIDENS;
else
constraintType = NAME_SAME_TYPE;
} else if (inName.endsWith(thisName)) {
int ndx = inName.lastIndexOf(thisName);
if (inName.charAt(ndx-1) == '.' )
if (inName.charAt(ndx-1) == '.' ^ thisName.charAt(0) == '.')
constraintType = NAME_NARROWS;
else
constraintType = NAME_SAME_TYPE;