This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2506fdaa02f1f1f9435879d4bf2e8e97fc50067b Author: Mark Thomas <[email protected]> AuthorDate: Thu Aug 27 10:56:17 2026 +0100 Remove deprecated code --- java/org/apache/tomcat/jni/SSL.java | 61 ------------------------------------- 1 file changed, 61 deletions(-) diff --git a/java/org/apache/tomcat/jni/SSL.java b/java/org/apache/tomcat/jni/SSL.java index 03e67da0d2..04c6b99fcc 100644 --- a/java/org/apache/tomcat/jni/SSL.java +++ b/java/org/apache/tomcat/jni/SSL.java @@ -111,67 +111,6 @@ public final class SSL { */ public static final int SSL_TMP_KEY_MAX = 8; - /* - * Define the SSL options - */ - /** - * No SSL options. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_NONE = 0; - /** - * SSL option for relative settings. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_RELSET = (1 << 0); - /** - * SSL option for standard environment variables. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_STDENVVARS = (1 << 1); - /** - * SSL option for exporting certificate data. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_EXPORTCERTDATA = (1 << 3); - /** - * SSL option for fake basic authentication. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_FAKEBASICAUTH = (1 << 4); - /** - * SSL option for strict require. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_STRICTREQUIRE = (1 << 5); - /** - * SSL option for optional renegotiation. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_OPTRENEGOTIATE = (1 << 6); - /** - * All SSL options combined. - * - * @deprecated Unused. Will be removed in Tomcat 12 onwards. - */ - @Deprecated - public static final int SSL_OPT_ALL = (SSL_OPT_STDENVVARS | SSL_OPT_EXPORTCERTDATA | SSL_OPT_FAKEBASICAUTH | - SSL_OPT_STRICTREQUIRE | SSL_OPT_OPTRENEGOTIATE); - /* * Define the SSL Protocol options */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
