diff options
| author | Kenny Root <kroot@google.com> | 2014-11-03 18:34:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-03 18:34:00 +0000 |
| commit | b0cb07348e6320ce51d0e8b88d240ecf834850d1 (patch) | |
| tree | 801360f7c52f1222f7976cf3bb7097d4535d0d31 | |
| parent | 5f8099ed181c2ba279c4a747096442389d5f8840 (diff) | |
| parent | 8a970637208207955fb6a719bd82902384b3c743 (diff) | |
| download | frameworks_base-b0cb07348e6320ce51d0e8b88d240ecf834850d1.zip frameworks_base-b0cb07348e6320ce51d0e8b88d240ecf834850d1.tar.gz frameworks_base-b0cb07348e6320ce51d0e8b88d240ecf834850d1.tar.bz2 | |
Merge "Track change to Conscrypt"
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/http/HttpsConnection.java | 2 | ||||
| -rw-r--r-- | tests/CoreTests/android/core/SSLSocketTest.java | 4 |
3 files changed, 4 insertions, 4 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[] { diff --git a/tests/CoreTests/android/core/SSLSocketTest.java b/tests/CoreTests/android/core/SSLSocketTest.java index b06790b..65062c2 100644 --- a/tests/CoreTests/android/core/SSLSocketTest.java +++ b/tests/CoreTests/android/core/SSLSocketTest.java @@ -907,7 +907,7 @@ public class SSLSocketTest extends TestCase { */ public void testClientSessionCaching() throws IOException, KeyManagementException { - OpenSSLContextImpl context = new OpenSSLContextImpl(); + OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred(); // Cache size = 2. FakeClientSessionCache fakeCache = new FakeClientSessionCache(); @@ -1000,7 +1000,7 @@ public class SSLSocketTest extends TestCase { public void testFileBasedClientSessionCache() throws IOException, KeyManagementException { - OpenSSLContextImpl context = new OpenSSLContextImpl(); + OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred(); String tmpDir = System.getProperty("java.io.tmpdir"); if (tmpDir == null) { fail("Please set 'java.io.tmpdir' system property."); |