This is an automated email from the ASF dual-hosted git repository.
dsoumis 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 ee868c8efd Ensure the Tomcat Native based OpenSSL SSLContext does not
drop TLS 1.3 when rebuilding the list of enabled protocols during
initialization.
ee868c8efd is described below
commit ee868c8efdceb6332dd64776083d0c8c50368e4a
Author: Dimitris Soumis <[email protected]>
AuthorDate: Thu Oct 15 18:48:46 2026 +0300
Ensure the Tomcat Native based OpenSSL SSLContext does not drop TLS 1.3
when rebuilding the list of enabled protocols during initialization.
---
java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 3 +++
webapps/docs/changelog.xml | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index c878b5d70f..619fc78b4c 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -525,6 +525,9 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
if ((opts & SSL.SSL_OP_NO_TLSv1_2) == 0) {
enabled.add(Constants.SSL_PROTO_TLSv1_2);
}
+ if ((opts & SSL.SSL_OP_NO_TLSv1_3) == 0) {
+ enabled.add(Constants.SSL_PROTO_TLSv1_3);
+ }
if ((opts & SSL.SSL_OP_NO_SSLv3) == 0) {
enabled.add(Constants.SSL_PROTO_SSLv3);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b56e868362..5ccf78ff48 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -459,6 +459,11 @@
buffer used by the BIO pair. Patch submitted by Lukas Hellebrandt.
(remm)
</fix>
+ <fix>
+ Ensure the Tomcat Native based OpenSSL <code>SSLContext</code> does not
+ drop TLS 1.3 when rebuilding the list of enabled protocols during
+ initialization. (dsoumis)
+ </fix>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
<fix>
Keep the asynchronous timeout in place until the timeout event has
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
