On 16/02/2015 23:12, ma...@apache.org wrote: > Author: markt > Date: Mon Feb 16 23:12:43 2015 > New Revision: 1660244 > > URL: http://svn.apache.org/r1660244 > Log: > OpenSSL 1.1.0 drops support for a number of ciphers. Remove them from the > expected list.
This has the added advantage that the full list of missing ciphers is now reported in the test failure. 10 more to go. Mark > > Modified: > tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java > > Modified: > tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660244&r1=1660243&r2=1660244&view=diff > ============================================================================== > --- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java > (original) > +++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java > Mon Feb 16 23:12:43 2015 > @@ -106,6 +106,16 @@ public class TestCipher { > if (openSSLAlias.contains("RC2-MD5")) { > continue; > } > + // As of OpenSSL 1.1.0, SSLv2 ciphers are not suported so exclude > + // them from the expected list > + if (cipher.getProtocol().equals(Protocol.SSLv2)) { > + continue; > + } > + // As of OpenSSl 1.1.0, EDH ciphers are not supported to exclude > + // them from the expected list > + if (openSSLAlias.contains("EDH-")) { > + continue; > + } > expectedCipherSuites.add(openSSLAlias + "+" + > cipher.getProtocol().getOpenSSLName()); > } > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
