typos, long lines, method renames, no more data/README

wangweij · Nov 8, 2024 · 34f9f8a · 34f9f8a
1 parent a7e2287
commit 34f9f8a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -39,16 +39,16 @@
 /// The files are either put into the `data` directory or another
 /// directory specified by the `test.acvp.data` test property.
 /// The test walks through the directory recursively and looks for
-/// file names equals to or ending with `internalProjection.json` and
-/// runs test on them.
+/// file names equal to or ending with `internalProjection.json` and
+/// runs tests on them.
 ///
-/// Set the `test.acvp.alg` test property to only test this algorithm.
+/// Set the `test.acvp.alg` test property to only test the specified algorithm.
 ///
 /// Sample files can be downloaded from
 /// [https://github.com/usnistgov/ACVP-Server/tree/master/gen-val/json-files].
 ///
 /// By default, the test uses system-preferred implementations.
-/// If you want to test on a specific provider, set the
+/// If you want to test a specific provider, set the
 /// `test.acvp.provider` test property. The provider must be
 /// registered.
 ///

diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
@@ -36,14 +36,14 @@ public class ML_DSA_Test {
     public static void run(JSONValue kat, Provider provider) throws Exception {
         var mode = kat.get("mode").asString();
         switch (mode) {
-            case "keyGen" -> mldsaGen(kat, provider);
-            case "sigGen" -> mldsaSign(kat, provider);
-            case "sigVer" -> mldsaVerify(kat, provider);
+            case "keyGen" -> keyGenTest(kat, provider);
+            case "sigGen" -> sigGenTest(kat, provider);
+            case "sigVer" -> sigVerTest(kat, provider);
             default -> throw new UnsupportedOperationException("Unknown mode: " + mode);
         }
     }
 
-    static void mldsaGen(JSONValue kat, Provider p) throws Exception {
+    static void keyGenTest(JSONValue kat, Provider p) throws Exception {
         var g = p == null
                 ? KeyPairGenerator.getInstance("ML-DSA")
                 : KeyPairGenerator.getInstance("ML-DSA", p);
@@ -67,7 +67,7 @@ static void mldsaGen(JSONValue kat, Provider p) throws Exception {
         }
     }
 
-    static void mldsaSign(JSONValue kat, Provider p) throws Exception {
+    static void sigGenTest(JSONValue kat, Provider p) throws Exception {
         var s = p == null
                 ? Signature.getInstance("ML-DSA")
                 : Signature.getInstance("ML-DSA", p);
@@ -82,17 +82,19 @@ static void mldsaSign(JSONValue kat, Provider p) throws Exception {
                     public String getFormat() { return "RAW"; }
                     public byte[] getEncoded() { return toByteArray(c.get("sk").asString()); }
                 };
-                var sr = new FixedSecureRandom(det ? new byte[32] : toByteArray(c.get("rnd").asString()));
+                var sr = new FixedSecureRandom(
+                        det ? new byte[32] : toByteArray(c.get("rnd").asString()));
                 s.initSign(sk, sr);
                 s.update(toByteArray(c.get("message").asString()));
                 var sig = s.sign();
-                Asserts.assertEqualsByteArray(sig, toByteArray(c.get("signature").asString()));
+                Asserts.assertEqualsByteArray(
+                        sig, toByteArray(c.get("signature").asString()));
             }
             System.out.println();
         }
     }
 
-    static void mldsaVerify(JSONValue kat, Provider p) throws Exception {
+    static void sigVerTest(JSONValue kat, Provider p) throws Exception {
         var s = p == null
                 ? Signature.getInstance("ML-DSA")
                 : Signature.getInstance("ML-DSA", p);

diff --git a/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java b/test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
@@ -37,13 +37,13 @@ public class ML_KEM_Test {
     public static void run(JSONValue kat, Provider provider) throws Exception {
         var mode = kat.get("mode").asString();
         switch (mode) {
-            case "keyGen" -> mlkemGen(kat, provider);
-            case "encapDecap" -> mlkemEnc(kat, provider);
+            case "keyGen" -> keyGenTest(kat, provider);
+            case "encapDecap" -> encapDecapTest(kat, provider);
             default -> throw new UnsupportedOperationException("Unknown mode: " + mode);
         }
     }
 
-    static void mlkemGen(JSONValue kat, Provider p) throws Exception {
+    static void keyGenTest(JSONValue kat, Provider p) throws Exception {
         var g = p == null
                 ? KeyPairGenerator.getInstance("ML-KEM")
                 : KeyPairGenerator.getInstance("ML-KEM", p);
@@ -68,7 +68,7 @@ static void mlkemGen(JSONValue kat, Provider p) throws Exception {
         }
     }
 
-    static void mlkemEnc(JSONValue kat, Provider p) throws Exception {
+    static void encapDecapTest(JSONValue kat, Provider p) throws Exception {
         var g = p == null
                 ? KEM.getInstance("ML-KEM")
                 : KEM.getInstance("ML-KEM", p);
@@ -87,7 +87,8 @@ static void mlkemEnc(JSONValue kat, Provider p) throws Exception {
                     var e = g.newEncapsulator(
                             ek, new FixedSecureRandom(toByteArray(c.get("m").asString())));
                     var enc = e.encapsulate();
-                    Asserts.assertEqualsByteArray(enc.encapsulation(), toByteArray(c.get("c").asString()));
+                    Asserts.assertEqualsByteArray(
+                            enc.encapsulation(), toByteArray(c.get("c").asString()));
                     Asserts.assertEqualsByteArray(
                             enc.key().getEncoded(), toByteArray(c.get("k").asString()));
                 }

diff --git a/test/jdk/sun/security/provider/acvp/data/README b/test/jdk/sun/security/provider/acvp/data/README