svn commit: r1723152 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java

[markt]

Author: markt
Date: Tue Jan  5 19:26:23 2016
New Revision: 1723152

URL: http://svn.apache.org/viewvc?rev=1723152&view=rev
Log:
CCM cipher names are a special case

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

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java?rev=1723152&r1=1723151&r2=1723152&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/CipherSuiteConverter.java
 Tue Jan  5 19:26:23 2016
@@ -380,9 +380,25 @@ public final class CipherSuiteConverter
             export = null;
         }
 
+        String bulkCipher = m.group(2);
+        String hmacAlgo = m.group(3);
+
+        // CCM is a special case
+        if ("CCM".equals(hmacAlgo)) {
+            bulkCipher += "-CCM";
+            hmacAlgo = "";
+        } else if ("CCM8".equals(hmacAlgo)) {
+            bulkCipher += "-CCM_8";
+            hmacAlgo = "";
+        }
+
         handshakeAlgo = toJavaHandshakeAlgo(handshakeAlgo, export);
-        String bulkCipher = toJavaBulkCipher(m.group(2), export);
-        String hmacAlgo = toJavaHmacAlgo(m.group(3));
+        bulkCipher = toJavaBulkCipher(bulkCipher, export);
+        hmacAlgo = toJavaHmacAlgo(hmacAlgo);
+
+        if (hmacAlgo.length() == 0) {
+            return handshakeAlgo + "_WITH_" + bulkCipher;
+        }
 
         return handshakeAlgo + "_WITH_" + bulkCipher + '_' + hmacAlgo;
     }



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