stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8345057: ML_KEM NamedParameterSpec constants removed by ML-DSA integration

Browse Source 
Reviewed-by: mullan, hchao
This commit is contained in:
Valerie Peng 2024-11-26 21:08:57 +00:00
parent 8389e24d38
commit 8c2b4f6271
5 changed files with 115 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java.base/share/classes/java/security/spec/NamedParameterSpec.java
View File

@ -92,6 +92,30 @@ public class NamedParameterSpec implements AlgorithmParameterSpec {
public static final NamedParameterSpec ML_DSA_87
= new NamedParameterSpec("ML-DSA-87");
/**
* The ML-KEM-512 parameters
*
* @since 24
*/
public static final NamedParameterSpec ML_KEM_512
= new NamedParameterSpec("ML-KEM-512");
/**
* The ML-KEM-768 parameters
*
* @since 24
*/
public static final NamedParameterSpec ML_KEM_768
= new NamedParameterSpec("ML-KEM-768");
/**
* The ML-KEM-1024 parameters
*
* @since 24
*/
public static final NamedParameterSpec ML_KEM_1024
= new NamedParameterSpec("ML-KEM-1024");
private final String name;
/**

69
test/jdk/java/security/spec/TestNamedParameterSpec.java Normal file
View File

@ -0,0 +1,69 @@
/*
* Copyright (c) 2024, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8345057
* @summary Test the existence of constants inside the
* java.security.spec.NamedParameterSpec class.
* @run main TestNamedParameterSpec
*/
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.security.spec.NamedParameterSpec;
import java.util.Arrays;
import java.util.TreeSet;
public class TestNamedParameterSpec {
// names of the static fields in NamedParameterSpec class
private static String[] EXPECTED = {
"ED25519", "ED448", "X25519", "X448",
"ML_DSA_44", "ML_DSA_65", "ML_DSA_87",
"ML_KEM_512", "ML_KEM_768", "ML_KEM_1024",
};
public static void main(String[] args) throws Exception {
Arrays.sort(EXPECTED);
var actual = getSortedConstNames(NamedParameterSpec.class);
// both arrays should be sorted before comparison
if (Arrays.compare(EXPECTED, actual) != 0) {
System.out.println("expected: " + Arrays.toString(EXPECTED));
System.out.println("actual: " + Arrays.toString(actual));
throw new RuntimeException("Name check failed");
}
System.out.println("Test Passed");
}
public static String[] getSortedConstNames(Class<?> clazz) {
TreeSet<String> names = new TreeSet<String>();
for (Field field : clazz.getDeclaredFields()) {
int mods = field.getModifiers();
if (Modifier.isPublic(mods) && Modifier.isStatic(mods)
&& Modifier.isFinal(mods)){
names.add(field.getName());
}
}
return names.toArray(new String[0]);
}
}

2
test/jdk/sun/security/provider/acvp/Launcher.java
View File

@ -30,7 +30,7 @@ import java.security.Security;
/*
* @test
* @bug 8342442
* @bug 8342442 8345057
* @library /test/lib
*/

12
test/jdk/sun/security/provider/acvp/ML_DSA_Test.java
View File

@ -43,6 +43,16 @@ public class ML_DSA_Test {
}
}
static NamedParameterSpec genParams(String pname) {
return switch (pname) {
case "ML-DSA-44" -> NamedParameterSpec.ML_DSA_44;
case "ML-DSA-65" -> NamedParameterSpec.ML_DSA_65;
case "ML-DSA-87" -> NamedParameterSpec.ML_DSA_87;
default -> throw new RuntimeException("Unknown params: " + pname);
};
}
static void keyGenTest(JSONValue kat, Provider p) throws Exception {
var g = p == null
? KeyPairGenerator.getInstance("ML-DSA")
@ -52,7 +62,7 @@ public class ML_DSA_Test {
: KeyFactory.getInstance("ML-DSA", p);
for (var t : kat.get("testGroups").asArray()) {
var pname = t.get("parameterSet").asString();
var np = new NamedParameterSpec(pname);
var np = genParams(pname);
System.out.println(">> " + pname);
for (var c : t.get("tests").asArray()) {
System.out.print(c.get("tcId").asString() + " ");

11
test/jdk/sun/security/provider/acvp/ML_KEM_Test.java
View File

@ -43,6 +43,15 @@ public class ML_KEM_Test {
}
}
static NamedParameterSpec genParams(String pname) {
return switch (pname) {
case "ML-KEM-512" -> NamedParameterSpec.ML_KEM_512;
case "ML-KEM-768" -> NamedParameterSpec.ML_KEM_768;
case "ML-KEM-1024" -> NamedParameterSpec.ML_KEM_1024;
default -> throw new RuntimeException("Unknown params: " + pname);
};
}
static void keyGenTest(JSONValue kat, Provider p) throws Exception {
var g = p == null
? KeyPairGenerator.getInstance("ML-KEM")
@ -52,7 +61,7 @@ public class ML_KEM_Test {
: KeyFactory.getInstance("ML-KEM", p);
for (var t : kat.get("testGroups").asArray()) {
var pname = t.get("parameterSet").asString();
var np = new NamedParameterSpec(pname);
var np = genParams(pname);
System.out.println(">> " + pname);
for (var c : t.get("tests").asArray()) {
System.out.print(c.get("tcId").asString() + " ");