You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/09/24 18:21:39 UTC
[tomcat] branch 10.0.x updated: Add support for OpenSSL 3.1.x to
unit tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new c9b14f7 Add support for OpenSSL 3.1.x to unit tests
c9b14f7 is described below
commit c9b14f71c6315becc3dcfb212d47721941a59947
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 24 19:19:08 2021 +0100
Add support for OpenSSL 3.1.x to unit tests
---
test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 7 +++++--
1 file changed, 5 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 9dafe46..cc91d47 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -49,7 +49,10 @@ public class TesterOpenSSL {
} catch (IOException e) {
versionString = "";
}
- if (versionString.startsWith("OpenSSL 3.0.0")) {
+ if (versionString.startsWith("OpenSSL 3.1.0")) {
+ // Note: Gump currently tests 10.x with OpenSSL 3.1.x
+ VERSION = 30100;
+ } else if (versionString.startsWith("OpenSSL 3.0.0")) {
// Note: Gump currently tests 10.x with OpenSSL 3.0.x
VERSION = 30000;
} else if (versionString.startsWith("OpenSSL 1.1.1")) {
@@ -337,7 +340,7 @@ public class TesterOpenSSL {
// Explicit OpenSSL path may also need explicit lib path
// (e.g. Gump needs this)
openSSLLibPath = openSSLPath.substring(0, openSSLPath.lastIndexOf('/'));
- openSSLLibPath = openSSLLibPath + "/../lib:" + openSSLLibPath + "/../lib64";
+ openSSLLibPath = openSSLLibPath + "/../:" + openSSLLibPath + "/../lib:" + openSSLLibPath + "/../lib64";
}
List<String> cmd = new ArrayList<>();
cmd.add(openSSLPath);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org