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 2016/05/06 08:13:18 UTC
svn commit: r1742511 -
/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Author: markt
Date: Fri May 6 08:13:18 2016
New Revision: 1742511
URL: http://svn.apache.org/viewvc?rev=1742511&view=rev
Log:
Get tests passing with OpenSSL 1.1.0-dev and 1.0.2-dev
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1742511&r1=1742510&r2=1742511&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java Fri May 6 08:13:18 2016
@@ -72,13 +72,23 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testHIGH() throws Exception {
- testSpecification("HIGH");
+ // 3DES has been moved to medium in 1.1.0-dev
+ if (TesterOpenSSL.VERSION < 10100) {
+ testSpecification("HIGH:!3DES");
+ } else {
+ testSpecification("HIGH");
+ }
}
@Test
public void testMEDIUM() throws Exception {
- testSpecification("MEDIUM");
+ // 3DES has been moved to medium in 1.1.0-dev
+ if (TesterOpenSSL.VERSION < 10100) {
+ testSpecification("MEDIUM:3DES");
+ } else {
+ testSpecification("MEDIUM");
+ }
}
@@ -289,7 +299,11 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testTLSv1() throws Exception {
- testSpecification("TLSv1");
+ // In OpenSSL 1.1.0-dev, TLSv1 refers to those ciphers that require
+ // TLSv1 rather than being an alias for SSLv3
+ if (TesterOpenSSL.VERSION >= 10100) {
+ testSpecification("TLSv1");
+ }
}
@@ -528,7 +542,12 @@ public class TestOpenSSLCipherConfigurat
// Tomcat 8 default as of 2014-08-04
// This gets an A- from https://www.ssllabs.com/ssltest with no FS for
// a number of the reference browsers
- testSpecification("HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5");
+ // 3DES has been moved to medium in 1.1.0-dev
+ if (TesterOpenSSL.VERSION < 10100) {
+ testSpecification("HIGH:!aNULL:!eNULL:!EXPORT:!3DES:!DES:!RC4:!MD5");
+ } else {
+ testSpecification("HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org