This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 67b52c2068 Fix key type
67b52c2068 is described below
commit 67b52c2068b04a6833f2ec1ca724ca376d7f663b
Author: remm <[email protected]>
AuthorDate: Thu Sep 18 11:16:15 2025 +0200
Fix key type
The key type used by Java is actually "ML-DSA", not "MLDSA". As a
result, it is not possible to use the straight enum toString since '-'
is not allowed in the name.
---
.../apache/tomcat/util/net/SSLHostConfigCertificate.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 02645ce67f..06e82737a0 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -321,11 +321,17 @@ public class SSLHostConfigCertificate implements
Serializable {
RSA(Authentication.RSA),
DSA(Authentication.DSS, Authentication.EdDSA),
EC(Authentication.ECDH, Authentication.ECDSA),
- MLDSA(Authentication.MLDSA);
+ MLDSA("ML-DSA", Authentication.MLDSA);
+ private final String keyType;
private final Set<Authentication> compatibleAuthentications;
Type(Authentication... authentications) {
+ this(null, authentications);
+ }
+
+ Type(String keyType, Authentication... authentications) {
+ this.keyType = keyType;
compatibleAuthentications = new HashSet<>();
if (authentications != null) {
compatibleAuthentications.addAll(Arrays.asList(authentications));
@@ -340,6 +346,14 @@ public class SSLHostConfigCertificate implements
Serializable {
return compatibleAuthentications.contains(scheme.getAuth());
}
+ @Override
+ public String toString() {
+ if (keyType != null) {
+ return keyType;
+ }
+ return super.toString();
+ }
+
}
enum StoreType {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
