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

[markt]

Author: markt
Date: Tue Jan  5 16:26:49 2016
New Revision: 1723114

URL: http://svn.apache.org/viewvc?rev=1723114&view=rev
Log:
Java uses DES_CBC_40 and DES40_CBC. The former is only used with Kerberos 
cipher suites that are not used for TLS so use the other format. Fixes 4 
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=1723114&r1=1723113&r2=1723114&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:26:49 2016
@@ -399,7 +399,7 @@ public final class CipherSuiteConverter
 
         if ("DES-CBC".equals(bulkCipher)) {
             if (export) {
-                return "DES_CBC_40";
+                return "DES40_CBC";
             } else {
                 return "DES_CBC";
             }



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