Author: markt
Date: Wed Mar 2 23:10:21 2016
New Revision: 1733389
URL: http://svn.apache.org/viewvc?rev=1733389&view=rev
Log:
More test simplification by limiting tests to 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=1733389&r1=1733388&r2=1733389&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
Wed Mar 2 23:10:21 2016
@@ -26,29 +26,22 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testDEFAULT() throws Exception {
- // EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
- // behaviour
- // DES, RC2 and RC4 were removed from default in 1.1.0-dev
+ // RC4 was removed from default in 1.1.0-dev
if (TesterOpenSSL.VERSION < 10100) {
- testSpecification("DEFAULT:!EXPORT:!DES:!RC2:!RC4");
+ testSpecification("DEFAULT:!RC4");
} else {
- testSpecification("DEFAULT:!EXPORT");
+ testSpecification("DEFAULT");
}
}
@Test
public void testCOMPLEMENTOFDEFAULT() throws Exception {
- // EXPORT was removed from DEFAULT in 1.1.0 but we prefer the old
- // behaviour
- // DES, RC2 and RC4 were removed from default in 1.1.0-dev
- if (TesterOpenSSL.VERSION < 10000) {
- // OpenSSL 0.9.8 excludes aNULL unless explicitly enabled
- testSpecification("COMPLEMENTOFDEFAULT:EXPORT:aNULL:DES:RC2:RC4");
- } else if (TesterOpenSSL.VERSION < 10100) {
- testSpecification("COMPLEMENTOFDEFAULT:EXPORT:aNULL:DES:RC2:RC4");
+ // NULL and RC4 were removed from default in 1.1.0-dev
+ if (TesterOpenSSL.VERSION < 10100) {
+ testSpecification("COMPLEMENTOFDEFAULT:RC4:aNULL");
} else {
- testSpecification("COMPLEMENTOFDEFAULT:EXPORT");
+ testSpecification("COMPLEMENTOFDEFAULT");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
