Author: markt
Date: Sun Aug 28 22:16:07 2016
New Revision: 1758157
URL: http://svn.apache.org/viewvc?rev=1758157&view=rev
Log:
3DES moved to medium in all supported versions
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=1758157&r1=1758156&r2=1758157&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
Sun Aug 28 22:16:07 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");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
