src/share/classes/sun/security/x509/URIName.java

rev 13439 : 8213952: Relax DNSName restriction as per RFC 1123
Reviewed-by: weijun, mullan, chegar

*** 129,145 ****
                  }
              } else {
                  try {
                      hostDNS = new DNSName(host);
                  } catch (IOException ioe) {
!                     // Not a valid DNS Name; see if it is a valid IPv4
                      // IPAddressName
                      try {
                          hostIP = new IPAddressName(host);
                      } catch (Exception ioe2) {
                          throw new IOException("invalid URI name (host " +
!                             "portion is not a valid DNS name, IPv4 address," +
                              " or IPv6 address):" + name);
                      }
                  }
              }
          }
--- 129,145 ----
                  }
              } else {
                  try {
                      hostDNS = new DNSName(host);
                  } catch (IOException ioe) {
!                     // Not a valid DNSName; see if it is a valid IPv4
                      // IPAddressName
                      try {
                          hostIP = new IPAddressName(host);
                      } catch (Exception ioe2) {
                          throw new IOException("invalid URI name (host " +
!                             "portion is not a valid DNSName, IPv4 address," +
                              " or IPv6 address):" + name);
                      }
                  }
              }
          }
*** 337,347 ****
                  if ((hostDNS == null) ||
                      !(otherHostObject instanceof DNSName)) {
                      // If one (or both) is an IP address, only same type
                      constraintType = NAME_SAME_TYPE;
                  } else {
!                     // Both host portions are DNS names. Are they domains?
                      boolean thisDomain = (host.charAt(0) == '.');
                      boolean otherDomain = (otherHost.charAt(0) == '.');
                      DNSName otherDNS = (DNSName) otherHostObject;
  
                      // Run DNSName.constrains.
--- 337,347 ----
                  if ((hostDNS == null) ||
                      !(otherHostObject instanceof DNSName)) {
                      // If one (or both) is an IP address, only same type
                      constraintType = NAME_SAME_TYPE;
                  } else {
!                     // Both host portions are DNSNames. Are they domains?
                      boolean thisDomain = (host.charAt(0) == '.');
                      boolean otherDomain = (otherHost.charAt(0) == '.');
                      DNSName otherDNS = (DNSName) otherHostObject;
  
                      // Run DNSName.constrains.