[tomcat] 01/04: Better version matching for OpenSSL 3.x

[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

commit 6bd7672cb3446b8e5246cc92692485682c21e73d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 27 09:13:00 2021 +0100

    Better version matching for OpenSSL 3.x
---
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index 88d2b46..fe30d7f 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -49,10 +49,10 @@ public class TesterOpenSSL {
         } catch (IOException e) {
             versionString = "";
         }
-        if (versionString.startsWith("OpenSSL 3.1.0")) {
+        if (versionString.startsWith("OpenSSL 3.1.")) {
             // Note: Gump currently tests 10.x with OpenSSL 3.1.x
             VERSION = 30100;
-        } else if (versionString.startsWith("OpenSSL 3.0.0")) {
+        } else if (versionString.startsWith("OpenSSL 3.0.")) {
             VERSION = 30000;
         } else if (versionString.startsWith("OpenSSL 1.1.1")) {
             // LTS

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