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

Commit bf15c7ce authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname... 

am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance

* commit 'dceda36b':
  Use hostname verifier directly instead of instance
parents 6f75a73c dceda36b

core/java/android/net/SSLCertificateSocketFactory.java

+1 −4
Original line number Diff line number Diff line
@@ -80,9 +80,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;
@@ -193,7 +190,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);

            }

        }