(tomcat) branch main updated: Support running unit tests with OpenSSL master (3.5.x)

[markt]

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 017a2fb4a5 Support running unit tests with OpenSSL master (3.5.x)
017a2fb4a5 is described below

commit 017a2fb4a52172ac8804fc8925b7fff974214091
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 5 20:24:27 2024 +0000

    Support running unit tests with OpenSSL master (3.5.x)
---
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 8b4f93313f..16b938ea4b 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -49,8 +49,10 @@ public class TesterOpenSSL {
         } catch (IOException e) {
             versionString = "";
         }
-        if (versionString.startsWith("OpenSSL 3.4.")) {
+        if (versionString.startsWith("OpenSSL 3.5.")) {
             // Note: Gump currently tests 12.x with OpenSSL HEAD which is 
current 3.4.x
+            VERSION = 30500;
+        } else if (versionString.startsWith("OpenSSL 3.4.")) {
             VERSION = 30400;
         } else if (versionString.startsWith("OpenSSL 3.3.")) {
             VERSION = 30300;


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