tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1696270 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Date Mon, 17 Aug 2015 13:23:10 GMT
Author: markt
Date: Mon Aug 17 13:23:10 2015
New Revision: 1696270

URL: http://svn.apache.org/r1696270
Log:
Don't fail if the OpenSSL: can't be found - just skip the tests.

Modified:
    tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java

Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1696270&r1=1696269&r2=1696270&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Mon
Aug 17 13:23:10 2015
@@ -34,9 +34,10 @@ public class TesterOpenSSL {
     public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS;
 
     static {
-        // Note: The tests are configured for the OpenSSL 1.1.0 development
-        //       branch. Running with a different version is likely to trigger
-        //       failures.
+        // Note: The following lists are intended to be aligned with the most
+        //       recent release of each OpenSSL release branch. Running the unit
+        //       tests with earlier releases is likely to result in failures.
+
         String versionString = null;
         try {
             versionString = executeOpenSSLCommand("version");
@@ -54,15 +55,11 @@ public class TesterOpenSSL {
         } else if (versionString.startsWith("OpenSSL 0.9.8")) {
             VERSION =   908;
         } else {
-            // Unknown OpenSSL version
-            throw new IllegalStateException("Unknown OpenSSL version " + versionString);
+            VERSION = -1;
         }
 
         HashSet<Cipher> unimplemented = new HashSet<>();
 
-        // Note: The following lists are intended to be aligned with the most
-        //       recent release of each OpenSSL release branch
-
         // These have been removed from all supported versions.
         unimplemented.add(Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA);
         unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA);



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


Mime
View raw message