[tomcat] branch 10.0.x updated: Path seems to have changed from lib to lib64. Support both.

[markt]

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 b12c7b5  Path seems to have changed from lib to lib64. Support both.
b12c7b5 is described below

commit b12c7b57865cc5319c25a31bf5c74e0f72dd231a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 20 18:56:27 2021 +0100

    Path seems to have changed from lib to lib64. Support both.
---
 test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 2 +-
 1 file changed, 1 insertion(+), 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 07edc4b..9dafe46 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -337,7 +337,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 = openSSLLibPath + "/../lib:" + openSSLLibPath + 
"/../lib64";
         }
         List<String> cmd = new ArrayList<>();
         cmd.add(openSSLPath);

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