This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e894745d62 Use the key manager delegate
e894745d62 is described below
commit e894745d62897ff8332c4678ad605ecdf7d847e7
Author: remm <[email protected]>
AuthorDate: Thu May 21 16:27:24 2026 +0200
Use the key manager delegate
---
java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java | 6 +++++-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
b/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
index 087bec737e..2dd544b491 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
@@ -73,7 +73,11 @@ public final class JSSEKeyManager extends
X509ExtendedKeyManager {
return serverKeyAlias;
}
- return super.chooseEngineServerAlias(keyType, issuers, engine);
+ if (delegate instanceof X509ExtendedKeyManager extendedKeyManager) {
+ return extendedKeyManager.chooseEngineServerAlias(keyType,
issuers, engine);
+ } else {
+ return super.chooseEngineServerAlias(keyType, issuers, engine);
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4001b855f2..61fe451fb8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -329,6 +329,10 @@
<fix>
Fix <code>MessageByte.equals</code> if called on a null MB. (remm)
</fix>
+ <fix>
+ Call the delegate key manager in JSSE to retrieve the server key.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
