commit bc1ea6573c76663718d441f7b0b849a91f3eefbd
author Neil Fuller <nfuller@google.com> Mon Oct 13 17:37:39 2014 +0100
committer Neil Fuller <nfuller@google.com> Mon Oct 13 18:09:13 2014 +0100
tree 6c86405d073d68bd7d0a4616389cce669794e174
parent 39d896a3dad05a8101b10a675e6e056c717e36c3

Suppress failing OkHttp CTS tests

Added an additional regression test for SSLSocketTest.

Bug: 17962997
Bug: 17750026
Change-Id: Ic1171a916a8dbfe4f0ae486d650583de2547175b

expectations/knownfailures.txt

diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 918caab..7f31c73 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -1473,6 +1473,19 @@
   ]
 },
 {
+  description: "Some OkHttp tests were written before the introduction of TLS_FALLBACK_SCSV and have only been fixed for APIs used by Android",
+  bug: 17962997,
+  names: [
+    "com.squareup.okhttp.SyncApiTest#recoverFromTlsHandshakeFailure",
+    "com.squareup.okhttp.AsyncApiTest#recoverFromTlsHandshakeFailure"
+  ]
+},
+{
+  description: "JavaApiConverterTest#createOkResponse_fromJavaHttpsUrlConnection works independently but fails when run with some other test(s).",
+  bug: 17962997,
+  name: "com.squareup.okhttp.internal.http.JavaApiConverterTest#createOkResponse_fromJavaHttpsUrlConnection"
+},
+{
   description: "Okhttp test hardcodes the TLS version expected.",
   bug: 14462336,
   names: [

luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java

diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
index 10cf159..4681877 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
@@ -1608,6 +1608,42 @@
         context.close();
     }
 
+    // Confirms that communication without the TLS_FALLBACK_SCSV cipher works as it always did.
+    public void test_SSLSocket_sendsNoTlsFallbackScsv_Fallback_Success() throws Exception {
+        TestSSLContext context = TestSSLContext.create();
+
+        final SSLSocket client = (SSLSocket)
+            context.clientContext.getSocketFactory().createSocket(context.host, context.port);
+        final SSLSocket server = (SSLSocket) context.serverSocket.accept();
+
+        // Confirm absence of TLS_FALLBACK_SCSV.
+        assertFalse(Arrays.asList(client.getEnabledCipherSuites())
+                .contains(StandardNames.CIPHER_SUITE_FALLBACK));
+
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        Future<Void> s = executor.submit(new Callable<Void>() {
+                public Void call() throws Exception {
+                    server.setEnabledProtocols(new String[] { "TLSv1", "SSLv3" });
+                    server.startHandshake();
+                    return null;
+                }
+            });
+        Future<Void> c = executor.submit(new Callable<Void>() {
+                public Void call() throws Exception {
+                    client.setEnabledProtocols(new String[] { "SSLv3" });
+                    client.startHandshake();
+                    return null;
+                }
+            });
+        executor.shutdown();
+
+        s.get();
+        c.get();
+        client.close();
+        server.close();
+        context.close();
+    }
+
     public void test_SSLSocket_sendsTlsFallbackScsv_InappropriateFallback_Failure() throws Exception {
         TestSSLContext context = TestSSLContext.create();
 
@@ -1616,6 +1652,8 @@
         final SSLSocket server = (SSLSocket) context.serverSocket.accept();
 
         final String[] serverCipherSuites = server.getEnabledCipherSuites();
+
+        // Add TLS_FALLBACK_SCSV
         final String[] clientCipherSuites = new String[serverCipherSuites.length + 1];
         System.arraycopy(serverCipherSuites, 0, clientCipherSuites, 0, serverCipherSuites.length);
         clientCipherSuites[serverCipherSuites.length] = StandardNames.CIPHER_SUITE_FALLBACK;