Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a550fa authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev

parents 1c9894aa f743e54f

core/java/android/net/http/CertificateChainValidator.java

+7 −1
Original line number Diff line number Diff line
@@ -168,7 +168,13 @@ public class CertificateChainValidator { 
        }



        try {

            SSLParametersImpl.getDefaultTrustManager().checkServerTrusted(chain, authType);

            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager();

            if (x509TrustManager instanceof TrustManagerImpl) {

                TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;

                trustManager.checkServerTrusted(chain, authType, domain);

            } else {

                x509TrustManager.checkServerTrusted(chain, authType);

            }

            return null;  // No errors.

        } catch (GeneralSecurityException e) {

            if (HttpLog.LOGV) {