commit 40be99b8679c9d93a7ded8f2daaf37ce0d464533
author Tobias Thierer <tobiast@google.com> Mon Jul 03 15:15:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 03 15:15:21 2017 +0000
tree 16cc50dd83d15f6a618eaa0607bc07128620b34b
parent 1cc9d3a1b85bdd736e284f01e022030e0b782f21
parent 3a2f341d846add4567f523b109a808e1b2968bff

Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
am: 3a2f341d84  -s ours

Change-Id: I6b11c4ae2aae772dc90a3ae98aa03104f5214672

android/src/android/net/http/CertificateChainValidator.java

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 {

android/src/android/net/http/HttpsConnection.java

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[] {