Upstream AOSP changes (#1207)

* Turn conscrypt-platform CT verification into a no-op Upstreams https://r.android.com/2986189 Test: m conscrypt * Remove NetworkSecurityPolicy references Upstreams https://r.android.com/3048194 Test: build --------- Co-authored-by: Sandro Montanari <sandrom@google.com>
google · May 8, 2024 · 655ad50 · 655ad50
1 parent a5a0aa0
commit 655ad50
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 101 deletions.
diff --git a/libcore-stub/src/main/java/libcore/net/NetworkSecurityPolicy.java b/libcore-stub/src/main/java/libcore/net/NetworkSecurityPolicy.java
diff --git a/platform/src/main/java/org/conscrypt/Platform.java b/platform/src/main/java/org/conscrypt/Platform.java
@@ -61,7 +61,6 @@
 import javax.net.ssl.StandardConstants;
 import javax.net.ssl.X509ExtendedTrustManager;
 import javax.net.ssl.X509TrustManager;
-import libcore.net.NetworkSecurityPolicy;
 import org.conscrypt.ct.CTLogStore;
 import org.conscrypt.ct.CTLogStoreImpl;
 import org.conscrypt.ct.CTPolicy;
@@ -462,8 +461,7 @@ static boolean supportsX509ExtendedTrustManager() {
     }
 
     static boolean isCTVerificationRequired(String hostname) {
-        return NetworkSecurityPolicy.getInstance().isCertificateTransparencyVerificationRequired(
-                hostname);
+        return false;
     }
 
     static boolean supportsConscryptCertStore() {