aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-20 20:02:11 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-20 20:02:11 +0000
commit7a99e557d4db052a9db37249df65d0e12b84df35 (patch)
treeb3c49617d3526ded14b9aa8b47939fce3e2efc6a
parent34b9722529f93be8b4d4ff94f51796207484c774 (diff)
parenta999cda2db0855a200a9af73fdc0938cd9de1c9f (diff)
downloadconscrypt-android12-tests-release.tar.gz
Snap for 11862486 from a999cda2db0855a200a9af73fdc0938cd9de1c9f to android12-tests-releaseandroid12-tests-release
Change-Id: I667172e27b3997f9d530edcfc71e0371d6e28878
-rw-r--r--common/src/test/java/org/conscrypt/javax/net/ssl/SSLSocketTest.java1
-rw-r--r--repackaged/common/src/test/java/com/android/org/conscrypt/javax/net/ssl/SSLSocketTest.java1
2 files changed, 2 insertions, 0 deletions
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 37b09e8a..17c3e77f 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 @@ public class SSLSocketTest {
// 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 f107d45e..5a556fdb 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 @@ public class SSLSocketTest {
// 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