This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 e0b92996b0 Deprecate unused code
e0b92996b0 is described below
commit e0b92996b0d27502a21144e4af12c70655f374d6
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 14 15:09:52 2026 +0100
Deprecate unused code
---
java/org/apache/tomcat/jni/SSLContext.java | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index a9e14dfefb..23ef880e60 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -16,10 +16,6 @@
*/
package org.apache.tomcat.jni;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* JNI bindings for OpenSSL SSL_CTX operations.
*/
@@ -441,31 +437,22 @@ public final class SSLContext {
* @param sniHostName The host name requested by the client
*
* @return The Java representation of the pointer to the OpenSSL
SSLContext to use for the given host or zero if no
- * SSLContext could be identified
+ * SSLContext could be identified. Always returns {@code 0}.
+ *
+ * @deprecated Unused. This method will be removed in Tomcat 12 onwards.
*/
+ @Deprecated
public static long sniCallBack(long currentCtx, String sniHostName) {
- SNICallBack sniCallBack = sniCallBacks.get(Long.valueOf(currentCtx));
- if (sniCallBack == null) {
- return 0;
- }
- // Can't be sure OpenSSL is going to provide the SNI value in lower
case
- // so convert it before looking up the SSLContext
- String hostName = (sniHostName == null) ? null :
sniHostName.toLowerCase(Locale.ENGLISH);
- return sniCallBack.getSslContext(hostName);
+ return 0;
}
- /**
- * A map of default SSL Contexts to SNICallBack instances (in Tomcat these
are instances of AprEndpoint) that will
- * be used to determine the SSL Context to use bases on the SNI host name.
It is structured this way since a Tomcat
- * instance may have several TLS enabled endpoints that each have
different SSL Context mappings for the same host
- * name.
- */
- private static final Map<Long,SNICallBack> sniCallBacks = new
ConcurrentHashMap<>();
-
/**
* Interface implemented by components that will receive the call back to
select an OpenSSL SSLContext based on the
* host name requested by the client.
+ *
+ * @deprecated Unused. This interface will be removed in Tomcat 12 onwards
*/
+ @Deprecated
public interface SNICallBack {
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
