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/08/28 22:19:53 UTC
svn commit: r1758158 - in
/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers:
TestOpenSSLCipherConfigurationParser.java TesterOpenSSL.java
Author: markt
Date: Sun Aug 28 22:19:53 2016
New Revision: 1758158
URL: http://svn.apache.org/viewvc?rev=1758158&view=rev
Log:
Align OpenSSL tests with 9.0.x (more 3DES related changes)
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1758158&r1=1758157&r2=1758158&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java Sun Aug 28 22:19:53 2016
@@ -72,23 +72,13 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testHIGH() throws Exception {
- // 3DES has been moved to medium in 1.1.0-dev
- if (TesterOpenSSL.VERSION < 10100) {
- testSpecification("HIGH:!3DES");
- } else {
- testSpecification("HIGH");
- }
+ testSpecification("HIGH");
}
@Test
public void testMEDIUM() throws Exception {
- // 3DES has been moved to medium in 1.1.0-dev
- if (TesterOpenSSL.VERSION < 10100) {
- testSpecification("MEDIUM:3DES");
- } else {
- testSpecification("MEDIUM");
- }
+ testSpecification("MEDIUM");
}
@@ -542,12 +532,7 @@ 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
- // 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");
- }
+ testSpecification("HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5");
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1758158&r1=1758157&r2=1758158&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Sun Aug 28 22:19:53 2016
@@ -64,7 +64,7 @@ public class TesterOpenSSL {
VERSION = -1;
}
- HashSet<Cipher> unimplemented = new HashSet<>();
+ HashSet<Cipher> unimplemented = new HashSet<>();
// These have been removed from all supported versions.
unimplemented.add(Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org