diff options
| author | Kenny Root <kroot@google.com> | 2013-07-24 06:51:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-24 06:51:29 +0000 |
| commit | e79b9280f0f20eefdbe4b76a6777abbdd346bac9 (patch) | |
| tree | 1f7cc803b8275845ed7d35ed9b41f339f8bf2ffe /core/java/android/net | |
| parent | ba23a6677e7a335078fb6fced9a75524e10b2de6 (diff) | |
| parent | 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c (diff) | |
| download | frameworks_base-e79b9280f0f20eefdbe4b76a6777abbdd346bac9.zip frameworks_base-e79b9280f0f20eefdbe4b76a6777abbdd346bac9.tar.gz frameworks_base-e79b9280f0f20eefdbe4b76a6777abbdd346bac9.tar.bz2 | |
Merge "Use hostname verifier directly instead of instance"
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 31c8edb..208b212 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -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); } } |