test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java

*** 26,36 ****
  // system properties in samevm/agentvm mode.
  //
  
  /*
   * @test
!  * @bug 6405536
   * @summary Verify that all ciphersuites work (incl. ECC using NSS crypto)
   * @author Andreas Sterbenz
   * @library ..
   * @library ../../../../java/security/testlibrary
   * @run main/othervm ClientJSSEServerJSSE
--- 26,36 ----
  // system properties in samevm/agentvm mode.
  //
  
  /*
   * @test
!  * @bug 6405536 8080102
   * @summary Verify that all ciphersuites work (incl. ECC using NSS crypto)
   * @author Andreas Sterbenz
   * @library ..
   * @library ../../../../java/security/testlibrary
   * @run main/othervm ClientJSSEServerJSSE
*** 47,67 ****
--- 47,82 ----
          // and keys used in this test are not disabled.
          Security.setProperty("jdk.tls.disabledAlgorithms", "");
  
          cmdArgs = args;
          main(new ClientJSSEServerJSSE());
+         // now test without SunEC Provider
+         System.setProperty("testWithoutSunEC", "true");
+         main(new ClientJSSEServerJSSE());
      }
  
      public void main(Provider p) throws Exception {
+         String testWithoutSunEC = System.getProperty("testWithoutSunEC");
          // MD5 is used in this test case, don't disable MD5 algorithm.
          Security.setProperty(
                  "jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
  
          if (p.getService("KeyFactory", "EC") == null) {
              System.out.println("Provider does not support EC, skipping");
              return;
          }
+ 
+ 
+         if (testWithoutSunEC != null) {
+             Provider sunec = Security.getProvider("SunEC");
+             if (sunec == null) {
+                 System.out.println("SunEC provider not present. Skipping test");
+                  return;
+             }
+             Security.removeProvider(sunec.getName());
+         }
+ 
          Providers.setAt(p, 1);
          CipherTest.main(new JSSEFactory(), cmdArgs);
          Security.removeProvider(p.getName());
      }