[jbossweb-commits] JBossWeb SVN: r2508 - branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl.

Author: remy.maucherat(a)jboss.com Date: 2014-09-09 10:10:18 -0400 (Tue, 09 Sep 2014) New Revision: 2508 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Log: BZ1127283: Cut & paste issue for generating anonymous ciphers. Submitted by Radim Hatlapatka. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-09-05 12:10:17 UTC (rev 2507) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-09-09 14:10:18 UTC (rev 2508) @@ -412,7 +412,7 @@ aliases.put("DSS", aliases.get(aDSS)); addListAlias(aDH, filterByAuthentication(all, Collections.singleton(Authentication.DH))); Set<Ciphers> aecdh = filterByKeyExchange(all, new HashSet<KeyExchange>(Arrays.asList(KeyExchange.ECDHe, KeyExchange.ECDHr))); - aecdh.removeAll(filterByAuthentication(all, Collections.singleton(Authentication.aNULL))); + aecdh.retainAll(filterByAuthentication(all, Collections.singleton(Authentication.aNULL))); addListAlias(AECDH, aecdh); addListAlias(aECDH, filterByAuthentication(all, Collections.singleton(Authentication.ECDH))); addListAlias(ECDSA, filterByAuthentication(all, Collections.singleton(Authentication.ECDSA)));