org.apache.conn.ssl: rename DistinguishedNameParser to AndroidDistinguishedNameParser

The name DistinguishedNameParser is used by other libraries having the
same package, and some apps incorrectly include packages that are
present in the boot classpath. This relatively newly introduced
DistinguishedNameParser ends up hiding the ones in the libraries.

Bug: 26647082
Change-Id: I735aef3c1e5dd04e5a8e2eda6da6d9c9179f1c70
This commit is contained in:
Sergio Giro
2016-01-21 15:25:01 +00:00
parent dbf8c17bd2
commit ab72367506
2 changed files with 4 additions and 4 deletions

View File

@@ -208,8 +208,8 @@ public abstract class AbstractVerifier implements X509HostnameVerifier {
}
public static String[] getCNs(X509Certificate cert) {
DistinguishedNameParser dnParser =
new DistinguishedNameParser(cert.getSubjectX500Principal());
AndroidDistinguishedNameParser dnParser =
new AndroidDistinguishedNameParser(cert.getSubjectX500Principal());
List<String> cnList = dnParser.getAllMostSpecificFirst("cn");
if(!cnList.isEmpty()) {

View File

@@ -29,7 +29,7 @@ import javax.security.auth.x500.X500Principal;
* @hide
*/
@Deprecated
final class DistinguishedNameParser {
final class AndroidDistinguishedNameParser {
private final String dn;
private final int length;
private int pos;
@@ -42,7 +42,7 @@ final class DistinguishedNameParser {
/** distinguished name chars */
private char[] chars;
public DistinguishedNameParser(X500Principal principal) {
public AndroidDistinguishedNameParser(X500Principal principal) {
// RFC2253 is used to ensure we get attributes in the reverse
// order of the underlying ASN.1 encoding, so that the most
// significant values of repeated attributes occur first.