Merge "DomainNameValiator: Remove workaround"

                }

            }

        } catch (CertificateParsingException e) {

            // TODO figure out if this comment is still true

            //      i.e. In what condition do we this exception with a valid certificate?

            // one way we can get here is if an alternative name starts with

            // '*' character, which is contrary to one interpretation of the

            // spec (a valid DNS name must start with a letter); there is no

            // good way around this, and in order to be compatible we proceed

            // to check the common name (ie, ignore alternative names)

            if (LOG_ENABLED) {

            String errorMessage = e.getMessage();

            if (errorMessage == null) {

                errorMessage = "failed to parse certificate";

            }

                Log.v(TAG, "DomainNameValidator.matchDns(): " + errorMessage);

            }

            Log.w(TAG, "DomainNameValidator.matchDns(): " + errorMessage);

            return false;

        }

        if (!hasDns) {