Attachment 912744 Details for Bug 1078204 – Fix both issues with the '+'

[patch] Fix both issues with the '+'

bz-1078204-plus-issues.patch (text/plain), 2.14 KB, created by Emmanuel Hugonnet (ehsavoie) on 2014-06-27 09:55:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Hugonnet (ehsavoie)

Created: 2014-06-27 09:55:58 UTC

Size: 2.14 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	(rÃ©vision 2466)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java	(copie de travail)
>@@ -62,6 +62,12 @@
>      * matching existing ones.
>      */
>     private static final String TO_END = "+";
>+     /**
>+     * Lists of cipher suites can be combined in a single cipher string using the + character. 
>+     * This is used as a logical and operation. 
>+     * For example SHA1+DES represents all cipher suites containing the SHA1 and the DES algorithms. 
>+     */
>+    private static final String AND = "+";
>     /**
>      * All ciphers by their openssl alias name.
>      */
>@@ -466,8 +472,10 @@
>     }
> 
>     static void moveToEnd(final LinkedHashSet<Ciphers> ciphers, final Collection<Ciphers> toBeMovedCiphers) {
>-        ciphers.removeAll(toBeMovedCiphers);
>-        ciphers.addAll(toBeMovedCiphers);
>+        List<Ciphers> movedCiphers = new ArrayList<Ciphers>(toBeMovedCiphers);
>+        movedCiphers.retainAll(ciphers);
>+        ciphers.removeAll(movedCiphers);
>+        ciphers.addAll(movedCiphers);
>     }
> 
>     static void add(final LinkedHashSet<Ciphers> ciphers, final String alias) {
>@@ -619,6 +627,17 @@
>                 break;
>             } else if (aliases.containsKey(element)) {
>                 add(ciphers, element);
>+            } else if (element.contains(AND)) {
>+                String[] intersections = element.split("\\" + AND);
>+                if(intersections.length > 0) {
>+                    List<Ciphers> result = aliases.get(intersections[0]);
>+                    for(int i = 1; i < intersections.length; i++) {
>+                        if(aliases.containsKey(intersections[i])) {
>+                            result.retainAll(aliases.get(intersections[i]));
>+                        }
>+                    }
>+                     ciphers.addAll(result);
>+                }
>             }
>         }
>         ciphers.removeAll(removedCiphers);

Actions: View | Diff

Attachments on bug 1078204: 893253 | 897144 | 898220 | 898235 | 910709 | 911706 | 911968 | 912705 | 912734 | 912744 | 913335 | 914449 | 914450