diff options
| author | Kenny Root <kroot@google.com> | 2014-10-31 10:28:04 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-10-31 12:06:09 -0700 |
| commit | 8a970637208207955fb6a719bd82902384b3c743 (patch) | |
| tree | e0dd7091dc44e6eb096b0bf15879ff38403c411e /core | |
| parent | c8dce8966b84203befb87a24a9d2d8ee87a39f7b (diff) | |
| download | frameworks_base-8a970637208207955fb6a719bd82902384b3c743.zip frameworks_base-8a970637208207955fb6a719bd82902384b3c743.tar.gz frameworks_base-8a970637208207955fb6a719bd82902384b3c743.tar.bz2 | |
Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
Diffstat (limited to 'core')
| -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 b0278d3..69be4fd 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -202,7 +202,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 7a12e53..e637eea 100644 --- a/core/java/android/net/http/HttpsConnection.java +++ b/core/java/android/net/http/HttpsConnection.java @@ -80,7 +80,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[] { |