From 7fdce769c3ef3885ec8f1716bdeedfc8b056a1d7 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 28 Mar 2017 10:02:23 -0700 Subject: [PATCH] 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 --- core/java/android/net/SSLCertificateSocketFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index b56437eba167..0b1569ca4ff5 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -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(); -- 2.11.0