Attachment 924507 Details for Bug 1127283 – Proposed patch

[patch] Proposed patch

AECDH.patch (text/plain), 1.52 KB, created by Radim Hatlapatka on 2014-08-06 14:18:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Hatlapatka

Created: 2014-08-06 14:18:13 UTC

Size: 1.52 KB

patch

obsolete

>Index: src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java	(revision 2482)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java	(working copy)
>@@ -20,6 +20,8 @@
>  */
> package org.apache.tomcat.util.net.jsse.openssl;
> 
>+import org.apache.tomcat.util.net.jsse.JSSELogger;
>+
> import java.util.ArrayList;
> import java.util.Arrays;
> import java.util.Collection;
>@@ -31,8 +33,6 @@
> import java.util.Map;
> import java.util.Set;
> 
>-import org.apache.tomcat.util.net.jsse.JSSELogger;
>-
> /**
>  * Class in charge with parsing openSSL expressions to define a list of ciphers.
>  *
>@@ -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)));

Actions: View | Diff

Attachments on bug 1127283: 924507