This is an automated email from the ASF dual-hosted git repository.
markt 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 02f2fb239d Remove unnecessary OpenSSL version check
02f2fb239d is described below
commit 02f2fb239d8a6721fda1106224ebfee4b8e8dc4e
Author: Mark Thomas <[email protected]>
AuthorDate: Sat Feb 3 11:14:46 2024 +0000
Remove unnecessary OpenSSL version check
Follow-up to https://bz.apache.org/bugzilla/show_bug.cgi?id=67616
---
java/org/apache/tomcat/jni/SSL.java | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 974e998c7d..3d5ba7c393 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -70,16 +70,8 @@ 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;
-
- static {
- if (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);
- }
- }
+ public static final int SSL_PROTOCOL_ALL =
+ (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2
| SSL_PROTOCOL_TLSV1_3);
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
