Author: markt
Date: Wed Apr 12 10:08:38 2017
New Revision: 1791102
URL: http://svn.apache.org/viewvc?rev=1791102&view=rev
Log:
Enable tests to pass when running against OpenSSL master and OpenSSL 1.0.2
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=1791102&r1=1791101&r2=1791102&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 Apr 12 10:08:38 2017
@@ -306,7 +306,11 @@ public class TestOpenSSLCipherConfigurat
@Test
public void testSSLv3() throws Exception {
- testSpecification("SSLv3");
+ // 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("SSLv3:TLSv1");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
