Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE

Browse Source 
* commit '3870c570bbd438cefd09a061b9481314a15dd659':
  Use hostname verifier directly instead of instance DO NOT MERGE
This commit is contained in:
Kenny Root
2013-08-13 11:41:11 -07:00
committed by Android Git Automerger
parent 261e00cb04 3870c570bb
commit 61768c97d6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -81,9 +81,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
} }
}; };
private static final HostnameVerifier HOSTNAME_VERIFIER =
HttpsURLConnection.getDefaultHostnameVerifier();
private SSLSocketFactory mInsecureFactory = null; private SSLSocketFactory mInsecureFactory = null;
private SSLSocketFactory mSecureFactory = null; private SSLSocketFactory mSecureFactory = null;
private TrustManager[] mTrustManagers = null; private TrustManager[] mTrustManagers = null;
@@ -195,7 +192,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
if (session == null) { if (session == null) {
throw new SSLException("Cannot verify SSL socket without session"); 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); throw new SSLPeerUnverifiedException("Cannot verify hostname: " + hostname);
} }
} }