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
commit 24dc54f82de14c630970273a0b6552f6fe9d6540 Author: Mark Thomas <[email protected]> AuthorDate: Mon Dec 8 17:47:51 2025 +0000 OpenSSL master branch is for 4.0.x --- .../apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 6ba6a0be36..31191d6d8d 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 ioe) { versionString = ""; } - if (versionString.startsWith("OpenSSL 3.6.")) { - // Note: Gump currently tests 12.x with OpenSSL HEAD which is current 3.6.x + if (versionString.startsWith("OpenSSL 4.0.")) { + // Note: Gump currently tests 12.x with OpenSSL HEAD which is currently 4.0.x + VERSION = 40000; + } else if (versionString.startsWith("OpenSSL 3.6.")) { VERSION = 30600; } else if (versionString.startsWith("OpenSSL 3.5.")) { VERSION = 30500; @@ -58,12 +60,10 @@ public class TesterOpenSSL { VERSION = 30400; } else if (versionString.startsWith("OpenSSL 3.3.")) { VERSION = 30300; - } else if (versionString.startsWith("OpenSSL 3.2.")) { - VERSION = 30200; } else if (versionString.startsWith("OpenSSL 3.0.")) { VERSION = 30000; } else { - // Note: 3.1.x is no longer supported by OpenSSL + // Note: 3.2.x and 3.1.x are no longer supported by OpenSSL // Note: Release branches 1.1.1 and earlier are no longer supported by // the OpenSSL team so these tests don't support them either. VERSION = -1; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
