This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 3549935bf BZ 67616: o.a.tomcat.jni.SSL contains useless check for old
OpenSSL version
3549935bf is described below
commit 3549935bfae8d3d9f870b79a346b8ae327a128db
Author: Michael Osipov <[email protected]>
AuthorDate: Wed Oct 11 19:11:09 2023 +0200
BZ 67616: o.a.tomcat.jni.SSL contains useless check for old OpenSSL version
---
java/org/apache/tomcat/jni/SSL.java | 7 +------
xdocs/miscellaneous/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 4fff8081b..64da0ca9c 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -73,12 +73,7 @@ public final class SSL {
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);
- }
+ SSL_PROTOCOL_ALL =
(SSL_PROTOCOL_TLSV1|SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2|SSL_PROTOCOL_TLSV1_3);
}
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index d7e1fad4f..638eb1fc4 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -40,6 +40,9 @@
<update>
Align default pass phrase prompt with HTTPd on Windows as well.
(michaelo)
</update>
+ <fix>
+ <bug>67616</bug>: o.a.tomcat.jni.SSL contains useless check for old
OpenSSL version. (michaelo)
+ </fix>
</changelog>
</section>
<section name="Changes in 2.0.6">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
