Author: markt
Date: Sat Aug 27 21:57:46 2016
New Revision: 1758079
URL: http://svn.apache.org/viewvc?rev=1758079&view=rev
Log:
3DES was removed from default in 1.1.0
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=1758079&r1=1758078&r2=1758079&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
Sat Aug 27 21:57:46 2016
@@ -26,9 +26,9 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testDEFAULT() throws Exception {
- // NULL, RC4, DSS, SEED, IDEA, CAMELLIA and SEC-CCM were removed from
default in 1.1.0-dev
if (TesterOpenSSL.VERSION < 10100) {
-
testSpecification("DEFAULT:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM");
+ // Account for classes of ciphers removed from DEFAULT in 1.1.0
+
testSpecification("DEFAULT:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES");
} else {
testSpecification("DEFAULT");
}
@@ -37,9 +37,9 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testCOMPLEMENTOFDEFAULT() throws Exception {
- // NULL, RC4, DSS, SEED, IDEA, CAMELLIA and SEC-CCM were removed from
default in 1.1.0-dev
if (TesterOpenSSL.VERSION < 10100) {
-
testSpecification("COMPLEMENTOFDEFAULT:RC4:DSS:SEED:IDEA:CAMELLIA:AESCCM:aNULL");
+ // Account for classes of ciphers removed from DEFAULT in 1.1.0
+
testSpecification("COMPLEMENTOFDEFAULT:RC4:DSS:SEED:IDEA:CAMELLIA:AESCCM:aNULL:3DES");
} else {
testSpecification("COMPLEMENTOFDEFAULT");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
