From 4c91d5cb4176e5f4970dc00835d802d857390d72 Mon Sep 17 00:00:00 2001 From: Ben Perez Date: Tue, 23 Jul 2024 19:35:11 +0000 Subject: [PATCH] 8322133: getParameterSpec(ECGenParameterSpec.class) on EC AlgorithmParameters does not return standard names Reviewed-by: mullan --- .../sun/security/util/ECParameters.java | 5 +- .../EC/CurveGetParameterSpec.java | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java diff --git a/src/java.base/share/classes/sun/security/util/ECParameters.java b/src/java.base/share/classes/sun/security/util/ECParameters.java index 429b022cc1b..79b38ead6fa 100644 --- a/src/java.base/share/classes/sun/security/util/ECParameters.java +++ b/src/java.base/share/classes/sun/security/util/ECParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -203,8 +203,7 @@ public final class ECParameters extends AlgorithmParametersSpi { } if (spec.isAssignableFrom(ECGenParameterSpec.class)) { - // Ensure the name is the Object ID - String name = namedCurve.getObjectId(); + String name = namedCurve.getNameAndAliases()[0]; return spec.cast(new ECGenParameterSpec(name)); } diff --git a/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java b/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java new file mode 100644 index 00000000000..ba4d64c2902 --- /dev/null +++ b/test/jdk/com/sun/crypto/provider/AlgorithmParameters/EC/CurveGetParameterSpec.java @@ -0,0 +1,47 @@ +/* + * 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 8322133 + * @summary Make sure getParameterSpec returns std name for EC AlgorithmParameters + * @modules java.base/sun.security.util + */ + +import java.security.AlgorithmParameters; +import java.security.KeyPairGenerator; +import java.security.spec.ECGenParameterSpec; + +public class CurveGetParameterSpec { + public static void main(String[] args) throws Exception { + KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC"); + kpg.initialize(new ECGenParameterSpec("secp384r1")); + var k = kpg.generateKeyPair().getPublic(); + var a = AlgorithmParameters.getInstance("EC"); + a.init(k.getParams()); + String name = a.getParameterSpec(ECGenParameterSpec.class).getName(); + if (!name.equals("secp384r1")) { + throw new Exception("EC getParameterSpec does not return std name secp384r1. Instead returns: " + name); + } + } +}