aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-17 20:17:19 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-17 20:17:19 +0000
commitc2f3f82c9a44fc00347d3dd30821a4a79597974a (patch)
tree584a8db4c02dce8be6e28ba430253e321e4e0791
parentd2d37c7e591f18f56ca8fcb1e4f68af240d55239 (diff)
parent80e74b61a2c38a1ba13d87ec4f3a3a25f33ec64d (diff)
downloadconscrypt-android12L-tests-release.tar.gz
Snap for 11857798 from 80e74b61a2c38a1ba13d87ec4f3a3a25f33ec64d to android12L-tests-releaseandroid12L-tests-release
Change-Id: I4f1dab3e67e356d1f87ee57c283283f36927e612
-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