svn commit: r1791101 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

[markt]

Author: markt
Date: Wed Apr 12 09:58:12 2017
New Revision: 1791101

URL: http://svn.apache.org/viewvc?rev=1791101&view=rev
Log:
Need to process renames later, once cipher name has been extracted from OpenSSL 
output

Modified:
    
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1791101&r1=1791100&r2=1791101&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
Wed Apr 12 09:58:12 2017
@@ -325,7 +325,7 @@ public class TesterOpenSSL {
         renamed.put("ECDHE-PSK-AES128-CBC-SHA+SSLv3", 
"ECDHE-PSK-AES128-CBC-SHA+TLSv1");
         renamed.put("ECDHE-PSK-AES256-CBC-SHA+SSLv3", 
"ECDHE-PSK-AES256-CBC-SHA+TLSv1");
         renamed.put("ECDHE-PSK-NULL-SHA+SSLv3", "ECDHE-PSK-NULL-SHA+TLSv1");
-        OPENSSL_RENAMED_CIPHERS = renamed;
+        OPENSSL_RENAMED_CIPHERS = Collections.unmodifiableMap(renamed);
     }
 
 
@@ -365,18 +365,16 @@ public class TesterOpenSSL {
         for (String cipher : ciphers) {
             // Handle rename for 1.1.0 onwards
             cipher = cipher.replaceAll("EDH", "DHE");
-            // More renames
-            if (OPENSSL_RENAMED_CIPHERS.containsKey(cipher)) {
-                cipher = OPENSSL_RENAMED_CIPHERS.get(cipher);
-            }
             if (first) {
                 first = false;
             } else {
                 output.append(':');
             }
+            StringBuilder name = new StringBuilder();
+
             // Name is first part
             int i = cipher.indexOf(' ');
-            output.append(cipher.substring(0, i));
+            name.append(cipher.substring(0, i));
 
             // Advance i past the space
             while (Character.isWhitespace(cipher.charAt(i))) {
@@ -385,8 +383,15 @@ public class TesterOpenSSL {
 
             // Protocol is the second
             int j = cipher.indexOf(' ', i);
-            output.append('+');
-            output.append(cipher.substring(i, j));
+            name.append('+');
+            name.append(cipher.substring(i, j));
+
+            // More renames
+            if (OPENSSL_RENAMED_CIPHERS.containsKey(name.toString())) {
+                output.append(OPENSSL_RENAMED_CIPHERS.get(name.toString()));
+            } else {
+                output.append(name.toString());
+            }
         }
         return output.toString();
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org