Make SSLSocketTest agnostic about whether TLSv1 is supported. am: 3b5ac3e6fb am: 167d0fe5af

Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/1882478

Change-Id: Ie101b11207f351c2e1cbe250330fd6966018db0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 26 insertions, 20 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 1099c291..d0d5dd7e 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
@@ -426,9 +426,9 @@ public class SSLSocketTest {
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);
-        client.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1"});
+        client.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.1"});
         final SSLSocket server = (SSLSocket) c.serverSocket.accept();
-        server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1", "TLSv1"});
+        server.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.2", "TLSv1.1"});
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<Void> future = executor.submit(new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -439,7 +439,7 @@ public class SSLSocketTest {
         executor.shutdown();
         client.startHandshake();
 
-        assertEquals("TLSv1", client.getSession().getProtocol());
+        assertEquals("TLSv1.1", client.getSession().getProtocol());
 
         future.get();
         client.close();
@@ -457,9 +457,9 @@ public class SSLSocketTest {
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);
-        client.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1"});
+        client.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.1"});
         final SSLSocket server = (SSLSocket) c.serverSocket.accept();
-        server.setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1"});
+        server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1"});
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<Void> future = executor.submit(new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -470,7 +470,7 @@ public class SSLSocketTest {
         executor.shutdown();
         client.startHandshake();
 
-        assertEquals("TLSv1", client.getSession().getProtocol());
+        assertEquals("TLSv1.1", client.getSession().getProtocol());
 
         future.get();
         client.close();
@@ -1056,7 +1056,7 @@ public class SSLSocketTest {
         Future<Void> s = runAsync(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                server.setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1"});
+                server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1"});
                 server.setEnabledCipherSuites(serverCipherSuites);
                 try {
                     server.startHandshake();
@@ -1072,7 +1072,7 @@ public class SSLSocketTest {
         Future<Void> c = runAsync(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                client.setEnabledProtocols(new String[]{"TLSv1"});
+                client.setEnabledProtocols(new String[]{"TLSv1.1"});
                 client.setEnabledCipherSuites(clientCipherSuites);
                 try {
                     client.startHandshake();
@@ -1094,8 +1094,11 @@ public class SSLSocketTest {
 
     @Test
     public void test_SSLSocket_tlsFallback_byVersion() throws Exception {
-        for (final String protocol : new String[] { "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" }) {
-            SSLSocketFactory factory = new DelegatingSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault()) {
+        String[] supportedProtocols =
+                SSLContext.getDefault().getDefaultSSLParameters().getProtocols();
+        for (final String protocol : supportedProtocols) {
+            SSLSocketFactory factory = new DelegatingSSLSocketFactory(
+                    (SSLSocketFactory) SSLSocketFactory.getDefault()) {
                 @Override protected SSLSocket configureSocket(SSLSocket socket) {
                     socket.setEnabledProtocols(new String[] {protocol});
                     String[] enabled = socket.getEnabledCipherSuites();
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 606dfb2e..80c84866 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
@@ -430,9 +430,9 @@ public class SSLSocketTest {
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);
-        client.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1"});
+        client.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.1"});
         final SSLSocket server = (SSLSocket) c.serverSocket.accept();
-        server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1", "TLSv1"});
+        server.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.2", "TLSv1.1"});
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<Void> future = executor.submit(new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -443,7 +443,7 @@ public class SSLSocketTest {
         executor.shutdown();
         client.startHandshake();
 
-        assertEquals("TLSv1", client.getSession().getProtocol());
+        assertEquals("TLSv1.1", client.getSession().getProtocol());
 
         future.get();
         client.close();
@@ -461,9 +461,9 @@ public class SSLSocketTest {
         SSLContext clientContext = c.clientContext;
         SSLSocket client = (SSLSocket)
                 clientContext.getSocketFactory().createSocket(c.host, c.port);
-        client.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1"});
+        client.setEnabledProtocols(new String[] {"TLSv1.3", "TLSv1.1"});
         final SSLSocket server = (SSLSocket) c.serverSocket.accept();
-        server.setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1"});
+        server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1"});
         ExecutorService executor = Executors.newSingleThreadExecutor();
         Future<Void> future = executor.submit(new Callable<Void>() {
             @Override public Void call() throws Exception {
@@ -474,7 +474,7 @@ public class SSLSocketTest {
         executor.shutdown();
         client.startHandshake();
 
-        assertEquals("TLSv1", client.getSession().getProtocol());
+        assertEquals("TLSv1.1", client.getSession().getProtocol());
 
         future.get();
         client.close();
@@ -1060,7 +1060,7 @@ public class SSLSocketTest {
         Future<Void> s = runAsync(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                server.setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1"});
+                server.setEnabledProtocols(new String[] {"TLSv1.2", "TLSv1.1"});
                 server.setEnabledCipherSuites(serverCipherSuites);
                 try {
                     server.startHandshake();
@@ -1076,7 +1076,7 @@ public class SSLSocketTest {
         Future<Void> c = runAsync(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                client.setEnabledProtocols(new String[]{"TLSv1"});
+                client.setEnabledProtocols(new String[] {"TLSv1.1"});
                 client.setEnabledCipherSuites(clientCipherSuites);
                 try {
                     client.startHandshake();
@@ -1098,8 +1098,11 @@ public class SSLSocketTest {
 
     @Test
     public void test_SSLSocket_tlsFallback_byVersion() throws Exception {
-        for (final String protocol : new String[] { "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" }) {
-            SSLSocketFactory factory = new DelegatingSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault()) {
+        String[] supportedProtocols =
+                SSLContext.getDefault().getDefaultSSLParameters().getProtocols();
+        for (final String protocol : supportedProtocols) {
+            SSLSocketFactory factory = new DelegatingSSLSocketFactory(
+                    (SSLSocketFactory) SSLSocketFactory.getDefault()) {
                 @Override protected SSLSocket configureSocket(SSLSocket socket) {
                     socket.setEnabledProtocols(new String[] {protocol});
                     String[] enabled = socket.getEnabledCipherSuites();