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

Commit 7fdce769 authored by Kenny Root's avatar Kenny Root
Browse files

Track updates to Conscrypt 

Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I1487d694c5abe7cf2b938d9f1869d9aeb5285ac5
parent c00af4c5

core/java/android/net/SSLCertificateSocketFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.os.SystemProperties; 
import android.util.Log;



import com.android.internal.os.RoSystemProperties;

import com.android.org.conscrypt.Conscrypt;

import com.android.org.conscrypt.OpenSSLContextImpl;

import com.android.org.conscrypt.OpenSSLSocketImpl;

import com.android.org.conscrypt.SSLClientSessionCache;
@@ -212,7 +213,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    private SSLSocketFactory makeSocketFactory(

            KeyManager[] keyManagers, TrustManager[] trustManagers) {

        try {

            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();

            OpenSSLContextImpl sslContext =  (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();

            sslContext.engineInit(keyManagers, trustManagers, null);

            sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache);

            return sslContext.engineGetSocketFactory();