[tomcat] branch 8.5.x updated: Fix OpenSSL version check

[markt]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 9e2623d020 Fix OpenSSL version check
9e2623d020 is described below

commit 9e2623d0208cc1ed53aac9a29eb2be305df85424
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 21 13:56:06 2022 +0100

    Fix OpenSSL version check
    
    Also some minor formatting clean-up
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 201e1761fc..88b27c83ef 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -181,10 +181,8 @@ public class AprLifecycleListener implements 
LifecycleListener {
 
     }
 
-    private static void terminateAPR()
-        throws ClassNotFoundException, NoSuchMethodException,
-               IllegalAccessException, InvocationTargetException
-    {
+    private static void terminateAPR() throws ClassNotFoundException, 
NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException {
         String methodName = "terminate";
         Method method = Class.forName("org.apache.tomcat.jni.Library")
             .getMethod(methodName, (Class [])null);
@@ -287,7 +285,7 @@ public class AprLifecycleListener implements 
LifecycleListener {
             return;
         }
         if (sslInitialized) {
-             //only once per VM
+            // Only once per VM
             return;
         }
 
@@ -309,7 +307,7 @@ public class AprLifecycleListener implements 
LifecycleListener {
         method.invoke(null, paramValues);
 
         // OpenSSL 3 onwards uses providers
-        boolean usingProviders = tcnMajor > 1 || (tcnVersion > 1233 && 
(SSL.version() & 0xF0000000L) > 2);
+        boolean usingProviders = tcnMajor > 1 || (tcnVersion > 1233 && 
(SSL.version() & 0xF0000000L) > 0x20000000);
 
         // Tomcat Native 1.x built with OpenSSL 1.x without explicitly enabling
         // FIPS and Tomcat Native < 1.2.34 built with OpenSSL 3.x will fail if


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org