support all ECParameterSpec params

wangweij · Jan 10, 2025 · e28e70e · e28e70e
1 parent e08c8ff
commit e28e70e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -39,8 +39,7 @@
 import java.security.cert.CertificateException;
 import java.security.cert.TrustAnchor;
 import java.security.cert.URICertStoreParameters;
-
-
+import java.security.spec.ECParameterSpec;
 import java.security.spec.NamedParameterSpec;
 import java.text.Collator;
 import java.text.MessageFormat;
@@ -2081,8 +2080,9 @@ private static String fullDisplayKeyName(Key key) {
             var params = ak.getParams();
             if (params instanceof NamedParameterSpec nps) {
                 return nps.getName(); // directly return
-            } else {
-                if (params instanceof NamedCurve nc) {
+            } else if (params instanceof ECParameterSpec eps) {
+                var nc = CurveDB.lookup(eps);
+                if (nc != null) {
                     alg += " (" + nc.getNameAndAliases()[0] + ")"; // append name
                 }
             }

diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -30,6 +30,7 @@
 import java.net.URLClassLoader;
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.PKIXBuilderParameters;
+import java.security.spec.ECParameterSpec;
 import java.security.spec.NamedParameterSpec;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1484,8 +1485,9 @@ private static String fullDisplayKeyName(Key key) {
             var params = ak.getParams();
             if (params instanceof NamedParameterSpec nps) {
                 return nps.getName(); // directly return
-            } else {
-                if (params instanceof NamedCurve nc) {
+            } else if (params instanceof ECParameterSpec eps) {
+                var nc = CurveDB.lookup(eps);
+                if (nc != null) {
                     alg += " (" + nc.getNameAndAliases()[0] + ")"; // append name
                 }
             }