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 b18acf0140 Fix OpenSSL version check
b18acf0140 is described below
commit b18acf01409078daefe11a3e82dc2009193e15e7
Author: Mark Thomas <[email protected]>
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 d64fedc2bd..60e6d1036b 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -175,10 +175,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);
@@ -269,7 +267,7 @@ public class AprLifecycleListener implements
LifecycleListener {
return;
}
if (sslInitialized) {
- //only once per VM
+ // Only once per VM
return;
}
@@ -291,7 +289,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: [email protected]
For additional commands, e-mail: [email protected]
