Author: markt
Date: Tue Jan 5 16:48:31 2016
New Revision: 1723120
URL: http://svn.apache.org/viewvc?rev=1723120&view=rev
Log:
Add Camellia 128/256 name mapping. Fixes 80 failures.
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=1723120&r1=1723119&r2=1723120&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 16:48:31 2016
@@ -414,6 +414,14 @@ public final class CipherSuiteConverter
}
}
+ if ("CAMELLIA128".equals(bulkCipher)) {
+ return "CAMELLIA_128_CBC";
+ }
+
+ if ("CAMELLIA256".equals(bulkCipher)) {
+ return "CAMELLIA_256_CBC";
+ }
+
return bulkCipher.replace('-', '_');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
