[tomcat] 02/02: Get tests passing with latest 1.0.2 code

[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 756cce5d3898bed56ffc5c9fec5d08339560e5a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 27 16:45:16 2019 +0100

    Get tests passing with latest 1.0.2 code
---
 .../org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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 91ac42e..95ab187 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -367,6 +367,14 @@ public class TesterOpenSSL {
         // Standard command to list the ciphers
         args.add("ciphers");
         args.add("-v");
+        if (VERSION < 10100) {
+            // Need to exclude the GOST ciphers
+            if (specification == null) {
+                specification = "DEFAULT:!aGOST";
+            } else {
+                specification = "!aGOST:" + specification;
+            }
+        }
         if (VERSION >= 10101) {
             // Need to exclude the TLSv1.3 ciphers
             args.add("-ciphersuites");


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