diff options
| author | Kenny Root <kroot@google.com> | 2014-10-31 10:28:04 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-03-17 21:27:05 +0000 |
| commit | 693ea60e9e3d2ef476e4f45caac234360d90bdb9 (patch) | |
| tree | 7b8791302b216d4e20af7dd00513e1d62c32c20d /core/java/android | |
| parent | 842eee9f816a2e35bf3c9ce6c14cd5e43684265b (diff) | |
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)
Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/http/HttpsConnection.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index c15e6e55ab45..6654577f310a 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -208,7 +208,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private SSLSocketFactory makeSocketFactory( KeyManager[] keyManagers, TrustManager[] trustManagers) { try { - OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); + OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred(); sslContext.engineInit(keyManagers, trustManagers, null); sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache); return sslContext.engineGetSocketFactory(); diff --git a/core/java/android/net/http/HttpsConnection.java b/core/java/android/net/http/HttpsConnection.java index 6bf01e241698..a8674de15ad4 100644 --- a/core/java/android/net/http/HttpsConnection.java +++ b/core/java/android/net/http/HttpsConnection.java @@ -79,7 +79,7 @@ public class HttpsConnection extends Connection { cache = FileClientSessionCache.usingDirectory(sessionDir); } - OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); + OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred(); // here, trust managers is a single trust-all manager TrustManager[] trustManagers = new TrustManager[] { |