Merge
authorvaleriep
Tue, 03 Dec 2013 17:25:28 -0800
changeset 21963 3dd055016f52
parent 21962 fb94f324e7f3 (diff)
parent 21961 50019af27ca3 (current diff)
child 21964 73a3fd499f24
Merge
--- a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java	Wed Dec 04 09:14:42 2013 +0800
+++ b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java	Tue Dec 03 17:25:28 2013 -0800
@@ -22,10 +22,10 @@
  */
 /*
  * @test
- * @bug 7200306
- * @run main/othervm/timeout=250 TestDSAKeyLength
+ * @bug 7200306 8029158
  * @summary verify that P11Signature impl will error out when initialized
  * with unsupported key sizes
+ * @library ..
  */
 
 
@@ -40,6 +40,11 @@
     }
 
     public void main(Provider provider) throws Exception {
+        if (isNSS(provider) && getNSSVersion() >= 3.14) {
+            System.out.println("Skip testing NSS " + getNSSVersion());
+            return;
+        }
+
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "SUN");
         kpg.initialize(2048, new SecureRandom());
         KeyPair pair = kpg.generateKeyPair();