From fb95a5394413dba7352a7ad2ebd39a3da42308a6 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Thu, 5 Dec 2024 01:27:10 +0000
Subject: [PATCH] 8345533: Switch ML-DSA implementation to FIPS 204 final

Reviewed-by: bperez, jnimeh
---
 .../share/classes/sun/security/provider/ML_DSA_Impls.java   | 2 +-
 test/jdk/sun/security/provider/acvp/Launcher.java           | 1 +
 test/jdk/sun/security/provider/acvp/ML_DSA_Test.java        | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
index 3213b1e5a5e..dffe7c5cdb1 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA_Impls.java
@@ -41,7 +41,7 @@ public class ML_DSA_Impls {
     // set the version to an older one. The following VM option is required:
     //
     // --add-exports java.base/sun.security.provider=ALL-UNNAMED
-    public static Version version = Version.DRAFT;
+    public static Version version = Version.FINAL;
 
     static int name2int(String name) {
         if (name.endsWith("44")) {
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
index b5c5908a902..356453292c1 100644
--- a/test/jdk/sun/security/provider/acvp/Launcher.java
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -32,6 +32,7 @@ import java.security.Security;
  * @test
  * @bug 8342442 8345057
  * @library /test/lib
+ * @modules java.base/sun.security.provider
  */
 
 /// This test runs on `internalProjection.json`-style files generated
diff --git a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
index 87bd304518f..657c01e4aa8 100644
--- a/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
+++ b/test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
@@ -23,6 +23,7 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.json.JSONValue;
 import jdk.test.lib.security.FixedSecureRandom;
+import sun.security.provider.ML_DSA_Impls;
 
 import java.security.*;
 import java.security.spec.EncodedKeySpec;
@@ -34,6 +35,11 @@ import static jdk.test.lib.Utils.toByteArray;
 public class ML_DSA_Test {
 
     public static void run(JSONValue kat, Provider provider) throws Exception {
+
+        // We only have ML-DSA test for internal functions, which
+        // is equivalent to the FIP 204 draft.
+        ML_DSA_Impls.version = ML_DSA_Impls.Version.DRAFT;
+
         var mode = kat.get("mode").asString();
         switch (mode) {
             case "keyGen" -> keyGenTest(kat, provider);