[DO NOT MERGE] @Ignore SSLSocket tests which require TLS 1.0 and 1.1 [Missed one on the first pass] In preparation for TLSv1.0 deprecation in the platform. Also needs cherry-picking to android12-tests-dev, but should not be allowed to automerge forwards as these tests are correctly skipped in android13-tests-dev if TLSv1 is disabled. Bug: 151078328 Bug: 249495768 Test: TH Change-Id: Ic0160d278b1a8fec0ac82f801f8e8ea25aafeaf8 Merged-In: Ic0160d278b1a8fec0ac82f801f8e8ea25aafeaf8
diff --git a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java index 37b09e8..17c3e77 100644 --- a/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java +++ b/common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java
@@ -1011,6 +1011,7 @@ // Confirms that communication without the TLS_FALLBACK_SCSV cipher works as it always did. @Test + @Ignore("Needs TLS 1.0 or 1.1 which are scheduled for deprecation") public void test_SSLSocket_sendsNoTlsFallbackScsv_Fallback_Success() throws Exception { TestSSLContext context = TestSSLContext.create(); // TLS_FALLBACK_SCSV is only applicable to TLS <= 1.2
diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketTest.java index f107d45..5a556fd 100644 --- a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketTest.java +++ b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketTest.java
@@ -1015,6 +1015,7 @@ // Confirms that communication without the TLS_FALLBACK_SCSV cipher works as it always did. @Test + @Ignore("Needs TLS 1.0 or 1.1 which are scheduled for deprecation") public void test_SSLSocket_sendsNoTlsFallbackScsv_Fallback_Success() throws Exception { TestSSLContext context = TestSSLContext.create(); // TLS_FALLBACK_SCSV is only applicable to TLS <= 1.2