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

Commit e79b9280 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Use hostname verifier directly instead of instance"

parents ba23a667 928ee1e4

core/java/android/net/SSLCertificateSocketFactory.java

+1 −4
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
        }

    };



    private static final HostnameVerifier HOSTNAME_VERIFIER =

        HttpsURLConnection.getDefaultHostnameVerifier();



    private SSLSocketFactory mInsecureFactory = null;

    private SSLSocketFactory mSecureFactory = null;

    private TrustManager[] mTrustManagers = null;
@@ -196,7 +193,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
            if (session == null) {

                throw new SSLException("Cannot verify SSL socket without session");

            }

            if (!HOSTNAME_VERIFIER.verify(hostname, session)) {

            if (!HttpsURLConnection.getDefaultHostnameVerifier().verify(hostname, session)) {

                throw new SSLPeerUnverifiedException("Cannot verify hostname: " + hostname);

            }

        }