This is an automated email from the ASF dual-hosted git repository.

dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 311c24c5f5 Ensure the Tomcat Native based OpenSSL SSLContext does not 
drop TLS 1.3 when rebuilding the list of enabled protocols during 
initialization.
311c24c5f5 is described below

commit 311c24c5f5597ecd4b5fb85bed81692ee67105f4
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 3bcbbb3d6b..32eb181070 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -497,6 +497,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 9c54eb6352..9e28b280a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -339,6 +339,11 @@
         implementations to set a limit on the maximum depth of nesting.
         (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>
     </changelog>
   </subsection>
   <subsection name="Web applications">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to