Author: markt
Date: Tue Feb 17 10:00:13 2015
New Revision: 1660337
URL: http://svn.apache.org/r1660337
Log:
Ensure the ciphers added in OpenSSL 1.1.0 are not expected to be present when
testing with 1.0.2
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1660337&r1=1660336&r2=1660337&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Tue Feb 17 10:00:13 2015
@@ -106,6 +106,13 @@ public class TestCipher {
if (openSSLAlias.contains("RC2-MD5")) {
continue;
}
+ // Added in OpenSSL 1.1.0 but the 8.0.x tests are configured for
+ // 1.0.2
+ if (cipher.getProtocol().equals(Protocol.TLSv1_2) &&
+ (cipher.getEnc().equals(Encryption.CAMELLIA256) ||
+ cipher.getEnc().equals(Encryption.CAMELLIA128))) {
+ 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
