Attachment 917082 Details for Bug 1117821 – Patch that seems to be fixing the issue

[patch] Patch that seems to be fixing the issue

bz-1117821-issue.patch (text/plain), 4.00 KB, created by Emmanuel Hugonnet (ehsavoie) on 2014-07-10 13:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Hugonnet (ehsavoie)

Created: 2014-07-10 13:44:26 UTC

Size: 4.00 KB

patch

obsolete

>Index: src/main/java/org/apache/tomcat/util/net/jsse/JSSELogger.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/JSSELogger.java	(rÃ©vision 2473)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/JSSELogger.java	(copie de travail)
>@@ -52,4 +52,8 @@
>     @LogMessage(level = WARN)
>     @Message(id = 9002, value = "Unknown element: %s")
>     void warnUnknowElement(final String alias);
>+    
>+    @LogMessage(level = DEBUG)
>+    @Message(id = 9003, value = "OpenSSl cipher parser initialized in %s ms ")
>+    void cipherParserInitialized(final long time);
> }
>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 2473)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java	(copie de travail)
>@@ -62,10 +62,9 @@
>      * 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. 
>+    /**
>+     * 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 = "+";
>     /**
>@@ -359,7 +358,7 @@
>     private static final String COMPLEMENTOFALL = "COMPLEMENTOFALL";
> 
>     private static final void init() {
>-
>+        long startTime = System.currentTimeMillis();
>         for (Ciphers cipher : Ciphers.values()) {
>             String alias = cipher.getOpenSSLAlias();
>             if (aliases.containsKey(alias)) {
>@@ -455,6 +454,7 @@
>         addListAlias(GOST89MAC, filterByMessageDigest(all, Collections.singleton(MessageDigest.GOST89MAC)));
>         addListAlias(PSK, filter(all, null, Collections.singleton(KeyExchange.PSK), Collections.singleton(Authentication.PSK), null, null, null));
>         addListAlias(KRB5, filter(all, null, Collections.singleton(KeyExchange.KRB5), Collections.singleton(Authentication.KRB5), null, null, null));
>+        JSSELogger.ROOT_LOGGER.cipherParserInitialized(System.currentTimeMillis() - startTime);
>         initialized = true;
>         String defaultExpression = System.getProperty(DEFAULT_EXPRESSION_KEY, "ALL:!eNULL:!aNULL");
>         addListAlias(DEFAULT, parse(defaultExpression));
>@@ -598,8 +598,10 @@
>     }
> 
>     static LinkedHashSet<Ciphers> parse(String expression) {
>-        if (!initialized) {
>-            init();
>+        synchronized (OpenSSLCipherConfigurationParser.class) {
>+            if (!initialized) {
>+                init();
>+            }
>         }
>         String[] elements = expression.split(SEPARATOR);
>         LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>();
>@@ -629,14 +631,14 @@
>                 add(ciphers, element);
>             } else if (element.contains(AND)) {
>                 String[] intersections = element.split("\\" + AND);
>-                if(intersections.length > 0) {
>+                if (intersections.length > 0) {
>                     List<Ciphers> result = new ArrayList<Ciphers>(aliases.get(intersections[0]));
>-                    for(int i = 1; i < intersections.length; i++) {
>-                        if(aliases.containsKey(intersections[i])) {
>+                    for (int i = 1; i < intersections.length; i++) {
>+                        if (aliases.containsKey(intersections[i])) {
>                             result.retainAll(aliases.get(intersections[i]));
>                         }
>                     }
>-                     ciphers.addAll(result);
>+                    ciphers.addAll(result);
>                 }
>             }
>         }

Actions: View | Diff

Attachments on bug 1117821: 916767 | 917082 | 917098