Merge "Remove HarmonyJSSE SSLContext, SSLSocket and SSLServerSocket."

5 files changed, 19 insertions, 109 deletions

diff --git a/benchmarks/src/benchmarks/regression/SSLLoopbackBenchmark.java b/benchmarks/src/benchmarks/regression/SSLLoopbackBenchmark.java
index 5533f0f..0d9a792 100644
--- a/benchmarks/src/benchmarks/regression/SSLLoopbackBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/SSLLoopbackBenchmark.java
@@ -16,7 +16,6 @@
 
 package benchmarks.regression;
 
-import com.google.caliper.Param;
 import com.google.caliper.SimpleBenchmark;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,24 +33,11 @@ import libcore.javax.net.ssl.TestSSLContext;
 import libcore.javax.net.ssl.TestSSLSocketPair;
 
 public class SSLLoopbackBenchmark extends SimpleBenchmark {
-    @Param private Implementation implementation;
-
-    public enum Implementation {
-        OPENSSL("AndroidOpenSSL"),
-        HARMONY("HarmonyJSSE");
-
-        final String providerName;
-
-        Implementation(String providerName) {
-            this.providerName = providerName;
-        }
-    };
 
     public void time(int reps) throws Exception {
         for (int i = 0; i < reps; ++i) {
             TestSSLContext context = TestSSLContext.create(
-                    TestKeyStore.getClient(), TestKeyStore.getServer(),
-                    implementation.providerName, implementation.providerName);
+                    TestKeyStore.getClient(), TestKeyStore.getServer());
             SSLSocket[] sockets = TestSSLSocketPair.connect(context, null, null);
             context.close();
             sockets[0].close();
diff --git a/benchmarks/src/benchmarks/regression/SSLSocketBenchmark.java b/benchmarks/src/benchmarks/regression/SSLSocketBenchmark.java
index fd72a79..5be890e 100644
--- a/benchmarks/src/benchmarks/regression/SSLSocketBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/SSLSocketBenchmark.java
@@ -69,24 +69,10 @@ public class SSLSocketBenchmark extends SimpleBenchmark {
         }
     }
 
-    @Param private Implementation implementation;
-
-    public enum Implementation { OPENSSL, HARMONY };
-
     private SocketFactory sf;
 
     @Override protected void setUp() throws Exception {
-        SSLContext sslContext;
-        switch (implementation) {
-            case OPENSSL:
-                sslContext = SSLContext.getInstance("SSL", "AndroidOpenSSL");
-                break;
-            case HARMONY:
-                sslContext = SSLContext.getInstance("SSL", "HarmonyJSSE");
-                break;
-            default:
-                throw new RuntimeException(implementation.toString());
-        }
+        SSLContext sslContext = SSLContext.getInstance("SSL");
         sslContext.init(null, null, null);
         this.sf = sslContext.getSocketFactory();
     }
diff --git a/luni/src/main/java/javax/net/ssl/SSLContext.java b/luni/src/main/java/javax/net/ssl/SSLContext.java
index ec5f0a8..f857c25 100644
--- a/luni/src/main/java/javax/net/ssl/SSLContext.java
+++ b/luni/src/main/java/javax/net/ssl/SSLContext.java
@@ -166,7 +166,7 @@ public class SSLContext {
      *         <tr>
      *             <td>SSL</td>
      *             <td>HarmonyJSSE</td>
-     *             <td>9+</td>
+     *             <td>9-19</td>
      *         </tr>
      *         <tr>
      *             <td>SSLv3</td>
@@ -176,7 +176,7 @@ public class SSLContext {
      *         <tr>
      *             <td>SSLv3</td>
      *             <td>HarmonyJSSE</td>
-     *             <td>9+</td>
+     *             <td>9-19</td>
      *         </tr>
      *         <tr>
      *             <td>TLS</td>
@@ -186,7 +186,7 @@ public class SSLContext {
      *         <tr>
      *             <td>TLS</td>
      *             <td>HarmonyJSSE</td>
-     *             <td>1+</td>
+     *             <td>1-19</td>
      *         </tr>
      *         <tr>
      *             <td>TLSv1</td>
@@ -196,7 +196,7 @@ public class SSLContext {
      *         <tr>
      *             <td>TLSv1</td>
      *             <td>HarmonyJSSE</td>
-     *             <td>1+</td>
+     *             <td>1-19</td>
      *         </tr>
      *         <tr>
      *             <td>TLSv1.1</td>
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 936c6f3..80c44ae 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
@@ -79,49 +79,13 @@ public class SSLSocketTest extends TestCase {
                 .ca(true)
                 .build();
         StringBuilder error = new StringBuilder();
-        if (StandardNames.IS_RI) {
-            test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore,
-                                                            StandardNames.JSSE_PROVIDER_NAME,
-                                                            StandardNames.JSSE_PROVIDER_NAME,
-                                                            true,
-                                                            true,
-                                                            error);
-        } else  {
-            test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore,
-                                                            "HarmonyJSSE",
-                                                            "HarmonyJSSE",
-                                                            false,
-                                                            false,
-                                                            error);
-            test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore,
-                                                            "AndroidOpenSSL",
-                                                            "AndroidOpenSSL",
-                                                            true,
-                                                            true,
-                                                            error);
-            test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore,
-                                                            "HarmonyJSSE",
-                                                            "AndroidOpenSSL",
-                                                            false,
-                                                            true,
-                                                            error);
-            test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore,
-                                                            "AndroidOpenSSL",
-                                                            "HarmonyJSSE",
-                                                            true,
-                                                            false,
-                                                            error);
-        }
+        test_SSLSocket_getSupportedCipherSuites_connect(testKeyStore, error);
         if (error.length() > 0) {
             throw new Exception("One or more problems in "
                     + "test_SSLSocket_getSupportedCipherSuites_connect:\n" + error);
         }
     }
     private void test_SSLSocket_getSupportedCipherSuites_connect(TestKeyStore testKeyStore,
-                                                                 String clientProvider,
-                                                                 String serverProvider,
-                                                                 boolean clientSecureRenegotiation,
-                                                                 boolean serverSecureRenegotiation,
                                                                  StringBuilder error)
             throws Exception {
 
@@ -130,20 +94,8 @@ public class SSLSocketTest extends TestCase {
         byte[] clientToServer = clientToServerString.getBytes();
         byte[] serverToClient = serverToClientString.getBytes();
 
-        TestSSLContext c = TestSSLContext.create(testKeyStore, testKeyStore,
-                                                 clientProvider, serverProvider);
-        String[] cipherSuites;
-        if (clientProvider.equals(serverProvider)) {
-            cipherSuites = c.clientContext.getSocketFactory().getSupportedCipherSuites();
-        } else {
-            String[] clientSuites = c.clientContext.getSocketFactory().getSupportedCipherSuites();
-            String[] serverSuites = c.serverContext.getSocketFactory().getSupportedCipherSuites();
-            Set<String> ccs = new HashSet<String>(Arrays.asList(clientSuites));
-            Set<String> scs = new HashSet<String>(Arrays.asList(serverSuites));
-            Set<String> cs = new HashSet<String>(ccs);
-            cs.retainAll(scs);
-            cipherSuites = cs.toArray(new String[cs.size()]);
-        }
+        TestSSLContext c = TestSSLContext.create(testKeyStore, testKeyStore);
+        String[] cipherSuites = c.clientContext.getSocketFactory().getSupportedCipherSuites();
 
         for (String cipherSuite : cipherSuites) {
             boolean errorExpected = StandardNames.IS_RI && cipherSuite.endsWith("_SHA256");
@@ -165,16 +117,10 @@ public class SSLSocketTest extends TestCase {
                     continue;
                 }
 
-                String[] clientCipherSuiteArray
-                        = (clientSecureRenegotiation
-                           ? new String[] { cipherSuite,
-                                            StandardNames.CIPHER_SUITE_SECURE_RENEGOTIATION }
-                           : new String[] { cipherSuite });
-                String[] serverCipherSuiteArray
-                        = (serverSecureRenegotiation
-                           ? new String[] { cipherSuite,
-                                            StandardNames.CIPHER_SUITE_SECURE_RENEGOTIATION }
-                           : new String[] { cipherSuite });
+                String[] clientCipherSuiteArray = new String[] {
+                        cipherSuite,
+                        StandardNames.CIPHER_SUITE_SECURE_RENEGOTIATION };
+                String[] serverCipherSuiteArray = clientCipherSuiteArray;
                 SSLSocket[] pair = TestSSLSocketPair.connect(c,
                                                              clientCipherSuiteArray,
                                                              serverCipherSuiteArray);
@@ -212,9 +158,7 @@ public class SSLSocketTest extends TestCase {
                 assertFalse(errorExpected);
             } catch (Exception maybeExpected) {
                 if (!errorExpected) {
-                    String message = ("Problem trying to connect cipher suite " + cipherSuite
-                                      + " client=" + clientProvider
-                                      + " server=" + serverProvider);
+                    String message = ("Problem trying to connect cipher suite " + cipherSuite);
                     System.out.println(message);
                     maybeExpected.printStackTrace();
                     error.append(message);
diff --git a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
index 5c424bc..b2386dd 100644
--- a/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
+++ b/support/src/test/java/libcore/javax/net/ssl/TestSSLContext.java
@@ -141,16 +141,11 @@ public final class TestSSLContext extends Assert {
      * TestSSLContext creation method that allows separate creation of server key store
      */
     public static TestSSLContext create(TestKeyStore client, TestKeyStore server) {
-        String provider = StandardNames.JSSE_PROVIDER_NAME;
-        return create(client, server, provider, provider);
-    }
-    public static TestSSLContext create(TestKeyStore client, TestKeyStore server,
-                                        String clientProvider, String serverProvider) {
         String protocol = "TLS";
-        SSLContext clientContext = createSSLContext(protocol, clientProvider,
-                                                    client.keyManagers, client.trustManagers);
-        SSLContext serverContext = createSSLContext(protocol, serverProvider,
-                                                    server.keyManagers, server.trustManagers);
+        SSLContext clientContext =
+                createSSLContext(protocol, client.keyManagers, client.trustManagers);
+        SSLContext serverContext =
+                createSSLContext(protocol, server.keyManagers, server.trustManagers);
         return create(client.keyStore, client.storePassword,
                       server.keyStore, server.storePassword,
                       client.keyManagers[0],
@@ -199,12 +194,11 @@ public final class TestSSLContext extends Assert {
      * using the certificates authorities from the same KeyStore.
      */
     public static final SSLContext createSSLContext(final String protocol,
-                                                    final String provider,
                                                     final KeyManager[] keyManagers,
                                                     final TrustManager[] trustManagers)
     {
         try {
-            SSLContext context = SSLContext.getInstance(protocol, provider);
+            SSLContext context = SSLContext.getInstance(protocol);
             context.init(keyManagers, trustManagers, new SecureRandom());
             return context;
         } catch (Exception e) {