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

Commit d00ced98 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am b0cb0734: Merge "Track change to Conscrypt" 

* commit 'b0cb0734':
  Track change to Conscrypt
parents 10ac55ba b0cb0734

core/java/android/net/SSLCertificateSocketFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

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 = new OpenSSLContextImpl();

            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();



            // 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 = 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.");