Attachment 948975 Details for Bug 1123356 – Fix for the issue

[patch] Fix for the issue

bz-1123356.patch (text/plain), 1.97 KB, created by Emmanuel Hugonnet (ehsavoie) on 2014-10-21 14:21:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Hugonnet (ehsavoie)

Created: 2014-10-21 14:21:29 UTC

Size: 1.97 KB

patch

obsolete

>Index: src/main/java/org/apache/tomcat/util/net/jsse/JSSEUtils.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/JSSEUtils.java	(rÃ©vision 2526)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/JSSEUtils.java	(copie de travail)
>@@ -40,17 +40,17 @@
>         Set<String> result = new LinkedHashSet<String>();
>         if (cipherSuites.length == 1) {
>             List<String> enabledCiphers = OpenSSLCipherConfigurationParser.parseExpression(cipherSuites[0]);
>-            for (String enabledCipher : enabledCiphers) {
>-                if (supportedCiphers.contains(enabledCipher)) {
>-                    result.add(enabledCipher);
>+            if (enabledCiphers.isEmpty()) {
>+                result.addAll(filter(Arrays.asList(cipherSuites), supportedCiphers));
>+            } else {
>+                for (String enabledCipher : enabledCiphers) {
>+                    if (supportedCiphers.contains(enabledCipher)) {
>+                        result.add(enabledCipher);
>+                    }
>                 }
>             }
>         } else {
>-            for (String enabledCipher : cipherSuites) {
>-                if (supportedCiphers.contains(enabledCipher)) {
>-                    result.add(enabledCipher);
>-                }
>-            }
>+            result.addAll(filter(Arrays.asList(cipherSuites), supportedCiphers));
>         }
>         if (!result.isEmpty()) {
>             StringBuilder builder = new StringBuilder(result.size() * 16);
>@@ -62,4 +62,14 @@
>         }
>         return result.toArray(new String[result.size()]);
>     }
>+
>+    private static Set<String> filter(final List<String> enabledCiphers, final Set<String> supportedCiphers) {
>+        Set<String> result = new LinkedHashSet<String>();
>+        for (String enabledCipher : enabledCiphers) {
>+            if (supportedCiphers.contains(enabledCipher)) {
>+                result.add(enabledCipher);
>+            }
>+        }
>+        return result;
>+    }
> }

Actions: View | Diff

Attachments on bug 1123356: 948975