Author: markt
Date: Mon Mar 9 14:02:47 2015
New Revision: 1665241
URL: http://svn.apache.org/r1665241
Log:
Read test results the wrong way around.
OpenSSL 1.0.2-dev includes SSLv2 ciphers in COMPLEMENTOFDEFAULT
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1665241&r1=1665240&r2=1665241&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Mon Mar 9 14:02:47 2015
@@ -484,7 +484,7 @@ public class OpenSSLCipherConfigurationP
Set<Cipher> complementOfDefault = filterByKeyExchange(all, new
HashSet<>(Arrays.asList(KeyExchange.EDH,KeyExchange.EECDH)));
complementOfDefault = filterByAuthentication(complementOfDefault,
Collections.singleton(Authentication.aNULL));
complementOfDefault.removeAll(aliases.get(eNULL));
- complementOfDefault.removeAll(aliases.get(SSLv2));
+ complementOfDefault.addAll(aliases.get(SSLv2));
addListAlias(COMPLEMENTOFDEFAULT, complementOfDefault);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
