Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4999b175 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

parents 13d8e41d 9a7c1a35

core/java/android/net/SSLCertificateSocketFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    private SSLSocketFactory makeSocketFactory(

            KeyManager[] keyManagers, TrustManager[] trustManagers) {

        try {

            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();

            OpenSSLContextImpl sslContext = new OpenSSLContextImpl();

            sslContext.engineInit(keyManagers, trustManagers, null);

            sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache);

            return sslContext.engineGetSocketFactory();

core/java/android/net/http/HttpsConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class HttpsConnection extends Connection { 
                cache = FileClientSessionCache.usingDirectory(sessionDir);

            }



            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();

            OpenSSLContextImpl sslContext = new OpenSSLContextImpl();



            // here, trust managers is a single trust-all manager

            TrustManager[] trustManagers = new TrustManager[] {

tests/CoreTests/android/core/SSLSocketTest.java

+2 −2
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ public class SSLSocketTest extends TestCase { 
     */

    public void testClientSessionCaching() throws IOException,

            KeyManagementException {

        OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();

        OpenSSLContextImpl context = new OpenSSLContextImpl();



        // Cache size = 2.

        FakeClientSessionCache fakeCache = new FakeClientSessionCache();
@@ -1000,7 +1000,7 @@ public class SSLSocketTest extends TestCase { 


    public void testFileBasedClientSessionCache() throws IOException,

            KeyManagementException {

        OpenSSLContextImpl context = OpenSSLContextImpl.getPreferred();

        OpenSSLContextImpl context = new OpenSSLContextImpl();

        String tmpDir = System.getProperty("java.io.tmpdir");

        if (tmpDir == null) {

            fail("Please set 'java.io.tmpdir' system property.");