7105940: Test regression: KeyStore must be from provider SunPKCS11-NSSKeyStore

Reviewed-by: weijun

test/sun/security/pkcs11/fips/CipherTest.java

@@ -394,8 +394,6 @@ public class CipherTest {
 
     public static void main(PeerFactory peerFactory, KeyStore keyStore,
             String[] args) throws Exception {
-        SSLContext reservedSSLContext = SSLContext.getDefault();
-        try {
         long time = System.currentTimeMillis();
         String relPath;
         if ((args != null) && (args.length > 0) && args[0].equals("sh")) {
@@ -437,9 +435,6 @@ public class CipherTest {
         cipherTest.run();
         time = System.currentTimeMillis() - time;
         System.out.println("Done. (" + time + " ms)");
-        } finally {
-            SSLContext.setDefault(reservedSSLContext);
-        }
     }
 
     static abstract class PeerFactory {

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

@@ -26,9 +26,9 @@
  * @bug 6313675 6323647
  * @summary Verify that all ciphersuites work in FIPS mode
  * @library ..
- * @run main/othervm ClientJSSEServerJSSE
  * @ignore JSSE supported cipher suites are changed with CR 6916074,
  *     need to update this test case in JDK 7 soon
+ * @run main/othervm ClientJSSEServerJSSE
  * @author Andreas Sterbenz
  */