You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/10/17 20:14:20 UTC
svn commit: r1844161 - /tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Author: markt
Date: Wed Oct 17 20:14:20 2018
New Revision: 1844161
URL: http://svn.apache.org/viewvc?rev=1844161&view=rev
Log:
Avoid exception when using Tomcat Native built with OpenSSL that does not support TLSv1.3
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1844161&r1=1844160&r2=1844161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Wed Oct 17 20:14:20 2018
@@ -74,8 +74,17 @@ public final class SSL {
public static final int SSL_PROTOCOL_TLSV1_1 = (1<<3);
public static final int SSL_PROTOCOL_TLSV1_2 = (1<<4);
public static final int SSL_PROTOCOL_TLSV1_3 = (1<<5);
- public static final int SSL_PROTOCOL_ALL = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 |
- SSL_PROTOCOL_TLSV1_2 | SSL_PROTOCOL_TLSV1_3);
+ public static final int SSL_PROTOCOL_ALL;
+
+ static {
+ if (SSL.version() >= 0x1010100f) {
+ SSL_PROTOCOL_ALL = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2 |
+ SSL_PROTOCOL_TLSV1_3);
+ } else {
+ SSL_PROTOCOL_ALL = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2);
+ }
+ }
+
/*
* Define the SSL verify levels
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org