Author: markt
Date: Tue Jan 5 17:03:22 2016
New Revision: 1723126
URL: http://svn.apache.org/viewvc?rev=1723126&view=rev
Log:
Add conversion to OpenSSL for AES 128/256. Fixes 10 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=1723126&r1=1723125&r2=1723126&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 17:03:22 2016
@@ -263,6 +263,14 @@ public final class CipherSuiteConverter
return "RC2-CBC";
}
+ if ("AES_128".equals(bulkCipher)) {
+ return "AES128";
+ }
+
+ if ("AES_256".equals(bulkCipher)) {
+ return "AES256";
+ }
+
return bulkCipher.replace('_', '-');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
