8365660: test/jdk/sun/security/pkcs11/KeyAgreement/ tests skipped without SkipExceprion

Reviewed-by: rhalade

Author: myankelev

test/jdk/sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@
  * @run main/othervm SupportedDHKeys
  */
 
+import jtreg.SkippedException;
+
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -62,8 +64,7 @@ private enum SupportedKeySize {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyPairGenerator", "DiffieHellman") == null) {
-            System.out.println("No support of DH KeyPairGenerator, skipping");
-            return;
+           throw new SkippedException("No support of DH KeyPairGenerator, skipping");
         }
 
         for (SupportedKeySize keySize : SupportedKeySize.values()) {

test/jdk/sun/security/pkcs11/KeyAgreement/TestDH.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,14 @@
 import javax.crypto.KeyAgreement;
 import javax.crypto.SecretKey;
 import jdk.test.lib.security.SecurityUtils;
+import jtreg.SkippedException;
 
 public class TestDH extends PKCS11Test {
 
     @Override
     public void main(Provider p) throws Exception {
         if (p.getService("KeyAgreement", "DH") == null) {
-            System.out.println("DH not supported, skipping");
-            return;
+            throw new SkippedException("DH not supported, skipping");
         }
         String kpgAlgorithm = "DH";
         KeyPairGenerator kpg = KeyPairGenerator.getInstance(kpgAlgorithm, p);

test/jdk/sun/security/pkcs11/KeyAgreement/TestInterop.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
 import javax.crypto.spec.DHPublicKeySpec;
 import jdk.test.lib.security.DiffieHellmanGroup;
 import jdk.test.lib.security.SecurityUtils;
+import jtreg.SkippedException;
 
 public class TestInterop extends PKCS11Test {
 
@@ -76,8 +77,7 @@ public class TestInterop extends PKCS11Test {
     @Override
     public void main(Provider prov) throws Exception {
         if (prov.getService("KeyAgreement", "DH") == null) {
-            System.out.println("DH not supported, skipping");
-            return;
+            throw new SkippedException("DH not supported, skipping");
         }
         try {
             System.out.println("testing generateSecret()");

test/jdk/sun/security/pkcs11/KeyAgreement/TestShort.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@
  * @run main/othervm TestShort
  */
 
+import jtreg.SkippedException;
+
 import java.math.BigInteger;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
@@ -90,12 +92,10 @@ public class TestShort extends PKCS11Test {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyAgreement", "DH") == null) {
-            System.out.println("DH not supported, skipping");
-            return;
+            throw new SkippedException("DH not supported, skipping");
         }
+
         try {
-            DHPublicKeySpec publicSpec;
-            DHPrivateKeySpec privateSpec;
             KeyFactory kf = KeyFactory.getInstance("DH", provider);
             KeyAgreement ka = KeyAgreement.getInstance("DH", provider);
 
@@ -106,15 +106,15 @@ public void main(Provider provider) throws Exception {
             ka.init(pr1);
             ka.doPhase(pu2, true);
             byte[] n2 = ka.generateSecret();
-            if (Arrays.equals(s2, n2) == false) {
+            if (!Arrays.equals(s2, n2)) {
                 throw new Exception("mismatch 2");
             }
             System.out.println("short ok");
 
             ka.init(pr1);
             ka.doPhase(pu3, true);
             byte[] n3 = ka.generateSecret();
-            if (Arrays.equals(s3, n3) == false) {
+            if (!Arrays.equals(s3, n3)) {
                 throw new Exception("mismatch 3");
             }
             System.out.println("normal ok");
@@ -123,27 +123,6 @@ public void main(Provider provider) throws Exception {
             ex.printStackTrace();
             throw ex;
         }
-
-/*
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance("DH", provider);
-        kpg.initialize(512);
-//        KeyPair kp1 = kpg.generateKeyPair();
-//      System.out.println(kp1.getPublic());
-//      System.out.println(kp1.getPrivate());
-        while (true) {
-            KeyAgreement ka = KeyAgreement.getInstance("DH", provider);
-            ka.init(pr1);
-            KeyPair kp2 = kpg.generateKeyPair();
-            ka.doPhase(kp2.getPublic(), true);
-            byte[] sec = ka.generateSecret();
-            if (sec.length == 64) {
-                System.out.println(kp2.getPrivate());
-                System.out.println(kp2.getPublic());
-                System.out.println(toString(sec));
-                break;
-            }
-        }
-/**/
     }
 
     public static void main(String[] args) throws Exception {

test/jdk/sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@
  * @run main/othervm UnsupportedDHKeys
  */
 
+import jtreg.SkippedException;
+
 import java.security.InvalidParameterException;
 import java.security.KeyPairGenerator;
 import java.security.Provider;
@@ -59,8 +61,7 @@ private enum UnsupportedKeySize {
     @Override
     public void main(Provider provider) throws Exception {
         if (provider.getService("KeyPairGenerator", "DiffieHellman") == null) {
-            System.out.println("No supported of DH KeyPairGenerator, skipping");
-            return;
+            throw new SkippedException("DH (DiffieHellman) is not supported in KeyPairGenerator, skipping");
         }
 
         for (UnsupportedKeySize keySize : UnsupportedKeySize.values()) {