diff options
| author | Sandro Montanari <sandrom@google.com> | 2024-03-04 14:46:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-04 14:46:35 +0000 |
| commit | 66eae266a0f27335770c55ea45300c0f4b06768c (patch) | |
| tree | b3f16f07c6994b0e9708ea5cb334287650723e0b | |
| parent | 545bd2bc26d57b3dc6a6498ceeafe2f99e6d9c2c (diff) | |
| parent | 5ed477c4d7958483ef02c24315a61a13a787c744 (diff) | |
| download | conscrypt-66eae266a0f27335770c55ea45300c0f4b06768c.tar.gz | |
Turn conscrypt-platform CT verification into a no-op am: 5ed477c4d7
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2986189
Change-Id: I43bff5cf705b98c8b4b18b95699ec9dea2e4b13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | platform/src/main/java/org/conscrypt/Platform.java | 3 | ||||
| -rw-r--r-- | repackaged/platform/src/main/java/com/android/org/conscrypt/Platform.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/platform/src/main/java/org/conscrypt/Platform.java b/platform/src/main/java/org/conscrypt/Platform.java index d4bc8490..ef696184 100644 --- a/platform/src/main/java/org/conscrypt/Platform.java +++ b/platform/src/main/java/org/conscrypt/Platform.java @@ -491,8 +491,7 @@ final class Platform { } static boolean isCTVerificationRequired(String hostname) { - return NetworkSecurityPolicy.getInstance().isCertificateTransparencyVerificationRequired( - hostname); + return false; } static boolean supportsConscryptCertStore() { diff --git a/repackaged/platform/src/main/java/com/android/org/conscrypt/Platform.java b/repackaged/platform/src/main/java/com/android/org/conscrypt/Platform.java index 9d0a897a..3ad55e27 100644 --- a/repackaged/platform/src/main/java/com/android/org/conscrypt/Platform.java +++ b/repackaged/platform/src/main/java/com/android/org/conscrypt/Platform.java @@ -492,8 +492,7 @@ final class Platform { } static boolean isCTVerificationRequired(String hostname) { - return NetworkSecurityPolicy.getInstance().isCertificateTransparencyVerificationRequired( - hostname); + return false; } static boolean supportsConscryptCertStore() { |