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: Ic1ea4659552ab9aef32019c4904a396bc0218d22
diff --git a/android/src/android/net/http/CertificateChainValidator.java b/android/src/android/net/http/CertificateChainValidator.java
index 96bf169..f338da6 100644
--- a/android/src/android/net/http/CertificateChainValidator.java
+++ b/android/src/android/net/http/CertificateChainValidator.java
@@ -16,7 +16,7 @@
package android.net.http;
-import com.android.org.conscrypt.SSLParametersImpl;
+import com.android.org.conscrypt.Conscrypt;
import com.android.org.conscrypt.TrustManagerImpl;
import android.util.Log;
@@ -227,7 +227,7 @@
}
try {
- X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager();
+ X509TrustManager x509TrustManager = Conscrypt.getDefaultX509TrustManager();
// Use duck-typing to try and call the hostname aware checkServerTrusted if
// available.
try {
diff --git a/android/src/android/net/http/HttpsConnection.java b/android/src/android/net/http/HttpsConnection.java
index 213537b..13387b8 100644
--- a/android/src/android/net/http/HttpsConnection.java
+++ b/android/src/android/net/http/HttpsConnection.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.util.Log;
+import com.android.org.conscrypt.Conscrypt;
import com.android.org.conscrypt.FileClientSessionCache;
import com.android.org.conscrypt.OpenSSLContextImpl;
import com.android.org.conscrypt.SSLClientSessionCache;
@@ -75,7 +76,7 @@
cache = FileClientSessionCache.usingDirectory(sessionDir);
}
- OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
+ OpenSSLContextImpl sslContext = (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();
// here, trust managers is a single trust-all manager
TrustManager[] trustManagers = new TrustManager[] {
